AMBARI-296. Update styles on Service Management page. Patch 3

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339735 13f79535-47bb-0310-9956-ffa450edef68

hmc/css/common.css

@@ -253,7 +253,7 @@ td {
   padding:0;
   background-color:#fff;
   min-height:100%;
-  padding-top:60px;
+  padding-top:0px;
 }
 
 #selectServicesCoreDivId label {
@@ -302,9 +302,73 @@ td {
 }
 
 .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;
+}
+
+.subnav {
+  width: 100%;
+  height: 36px;
+  background-color: #eeeeee; /* Old browsers */
+  background-repeat: repeat-x; /* Repeat the gradient */
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
+  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
+  background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
+  background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.subnav .nav {
+  margin-bottom: 0;
+}
+.subnav .nav > li > a {
+  margin: 0;
+  padding-top:    11px;
+  padding-bottom: 11px;
+  border-left: 1px solid #f5f5f5;
+  border-right: 1px solid #e5e5e5;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+.subnav .nav > .active > a,
+.subnav .nav > .active > a:hover {
+  padding-left: 13px;
+  color: #777;
+  background-color: #e9e9e9;
+  border-right-color: #ddd;
+  border-left: 0;
+  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
+     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
+          box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
+}
+.subnav .nav > .active > a .caret,
+.subnav .nav > .active > a:hover .caret {
+  border-top-color: #777;
+}
+.subnav .nav > li:first-child > a,
+.subnav .nav > li:first-child > a:hover {
+  border-left: 0;
+  padding-left: 12px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+.subnav .nav > li:last-child > a {
+  border-right: 0;
+}
+.subnav .dropdown-menu {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
 }

hmc/css/manageServices.css

@@ -72,7 +72,7 @@
 .serviceManagementEntryName {
   display:inline-block;
   border:0px solid black;
-  width:200px;
+  width:180px;
  
 /* Temporarily make links within .serviceManagementEntryName not look like links. */
   pointer-events: none;
@@ -90,27 +90,18 @@
 
 .serviceManagementEntryActionsContainer {
   float: right;
-}
-
-.serviceManagementEntryAction {
-  background-size: 24px 24px;
-  display: inline-block;
-  height: 24px;
-  width: 24px;
-  margin-left: 7px;
-  margin-right: 7px;
+  margin-top:-4px;
 }
 
 .serviceManagementEntryActionStart {
-  background-image: url(../images/start.png);
+	margin-right:4px;
 }
 
 .serviceManagementEntryActionStop {
-  background-image: url(../images/stop.png);
+	margin-right:4px;
 }
 
 .serviceManagementEntryActionReconfigure {
-  background-image: url(../images/reconfigure.png);
 }
 
 #serviceManagementGlobalActionsDivId {

hmc/html/initializeCluster.php

@@ -172,7 +172,7 @@
 
                 <div class="pageSummary">
                 	<h2>Assign Services to Nodes</h2>
-                	<p>We have categorized the given nodes into Node-groups and also suggested the locations of various service-masters. Drap and drop service-masters that you wish to change. Click on the given links if you wish to change the node assignments.</p>
+                	<p>We have categorized the given nodes into Node-groups and also suggested the locations of various service-masters. Drag and drop service-masters that you wish to change. Click on the given links if you wish to change the node assignments.</p>
                 </div>
                 <div id="serviceMastersLinksDivId">
                 </div>
@@ -185,7 +185,7 @@
               <div name="configureClusterCoreDiv" id="configureClusterCoreDivId" style="display:none">
                 <div class="pageSummary">
                 	<h2>Specify Mount Points</h2>
-                	<p>We found the following mount points on your nodes. Please confirm/modify the mount points to use for the services shown.
+                	<p>We found the following mount points on your nodes. Please confirm/modify the mount points to use for your nodes.
                 </div>
                 
                 <div id="configureClusterInputContainerDivId">
@@ -234,7 +234,8 @@
                 <div name="deployCoreDiv" id="deployCoreDivId" style="display:none">
                   <div class="pageSummary">
                   	<h2>Review and Deploy</h2>
-                  	<p>Please review your settings below, we are ready for a deploy! If you wish to make any changes, you can click on the installation stages above.</p>               
+                  	<p>We are ready to deploy!  Please review your settings below.</p>
+                  	<p>If you wish to make any changes, you can click on any of the installation stages above.  Note that if you do go back to a stage, you will have to go through all the subsequent stages again.</p>               
                   </div>
                   <form id="deployFormId">
                     <fieldset id="deployFieldSetId">

hmc/html/topnav.html

@@ -6,7 +6,7 @@
 			$logoUrl = '/hmc/html';
 		}
 	?>
-	<div class="navbar  navbar-fixed-top">
+	<div class="navbar">
 		<div class="navbar-inner">
 			<div class="container">
 				<img style="float:left;padding-top:5px" src="logo-small.gif">

hmc/js/manageServices.js

@@ -227,11 +227,12 @@ function serviceManagementActionClickHandler( action, serviceName ) {
   };
 
   var confirmationDataPanelYesPanel = {
-    value: 'Yes',
+    value: 'OK',
     action: function (e) {
       e.preventDefault();
       performServiceManagement( action, serviceName, confirmationDataPanel );
     },
+    classNames: 'yo',
     section: 'footer'
   };
 
@@ -399,14 +400,14 @@ function generateServiceManagementEntryMarkup( serviceName, serviceInfo ) {
               
       generatedServiceManagementEntryMarkup += 
             '<a href="javascript:void(null)" name="start" title="Start" ' +
-               'class="serviceManagementEntryAction serviceManagementEntryActionStart"></a>' +
+               'class="btn serviceManagementEntryAction serviceManagementEntryActionStart"><i class="icon-play"></i></a>' +
             '<a href="javascript:void(null)" name="stop" title="Stop" ' +
-               'class="serviceManagementEntryAction serviceManagementEntryActionStop"></a>';
+               'class="btn serviceManagementEntryAction serviceManagementEntryActionStop"><i class="icon-stop"></i></a>';
     }
 
     generatedServiceManagementEntryMarkup += 
             '<a href="javascript:void(null)" name="reconfigure" title="Reconfigure" ' +
-               'class="serviceManagementEntryAction serviceManagementEntryActionReconfigure"></a>' +
+               'class="btn serviceManagementEntryAction serviceManagementEntryActionReconfigure"><i class="icon-cog"></i></a>' +
           '</div>' +
         '</div>' +
       '</li>';