Pārlūkot izejas kodu

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

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339705 13f79535-47bb-0310-9956-ffa450edef68
Ramya Sunil 13 gadi atpakaļ
vecāks
revīzija
61b001c26e

+ 2 - 0
CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-296. Update styles on Service Management page (Yusaku Sako via ramya)
+
   AMBARI-264. Nagios Admin Contact should be checked to ensure it is always an 
   email address (Vinod via ramya)
 

+ 2 - 2
hmc/css/bootstrap.css

@@ -1876,7 +1876,7 @@ input[type="submit"].btn.btn-mini {
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
+  background-image: url("../images/glyphicons-halflings.png");
   background-position: 14px 14px;
   background-repeat: no-repeat;
 }
@@ -1885,7 +1885,7 @@ input[type="submit"].btn.btn-mini {
   *margin-left: 0;
 }
 .icon-white {
-  background-image: url("../img/glyphicons-halflings-white.png");
+  background-image: url("../images/glyphicons-halflings-white.png");
 }
 .icon-glass {
   background-position: 0      0;

+ 0 - 1
hmc/css/common.css

@@ -111,7 +111,6 @@ select {
 
 #installationMainFormsDivId {
   /* border:1px solid; */
-  margin-top: 8px;
   display:block;
 }
 

+ 1 - 26
hmc/css/manageServices.css

@@ -114,32 +114,7 @@
 }
 
 #serviceManagementGlobalActionsDivId {
-  width: 316px; 
-  margin-left: auto;
-  margin-right: auto; 
-}
-
-#serviceManagementGlobalActionsDivId button {
-  border-style: solid;
-  border-width: 3px;
-  background-color: #c5c5c5;
-  border-color: #ee5701;
-  border-radius:4px;
-  -moz-border-radius:4px;
-  -webkit-border-radius:4px;
-  padding: 5px;
-  text-align: center;
-  width: 150px;
-  font-weight: bold;
-  font-size: 16px;
-  margin-left: 3px;
-  margin-right: 3px;
-}
-
-#serviceManagementGlobalActionsDivId button:hover {
-  color: white;
-  background-color: gray;
-  cursor: pointer;
+  margin-left:140px;
 }
 
 ul#serviceManagementListId,

+ 2 - 6
hmc/html/manageServices.php

@@ -76,12 +76,8 @@
         <br/>
 
         <div id="serviceManagementGlobalActionsDivId" style="display:none">
-          <button id="serviceManagementGlobalActionsStartAllButtonId" name="startAll">
-            Start All
-          </button>
-          <button id="serviceManagementGlobalActionsStopAllButtonId" name="stopAll">
-            Stop All
-          </button>
+          <button class="btn btn-large" id="serviceManagementGlobalActionsStartAllButtonId" name="startAll" style="margin-right:10px"><i class="icon-play" style="margin-right:10px"></i>Start All</button>
+          <button class="btn btn-large" id="serviceManagementGlobalActionsStopAllButtonId" name="stopAll"><i class="icon-stop" style="margin-right:10px"></i>Stop All</button>
         </div>
 
         <br/>

+ 2 - 2
hmc/js/manageServices.js

@@ -218,7 +218,7 @@ function serviceManagementActionClickHandler( action, serviceName ) {
   var confirmationDataPanel;
 
   var confirmationDataPanelNoButton = {
-    value: 'Nah, Forget It',
+    value: 'Cancel',
     action: function (e) {
       e.preventDefault();
       destroyInformationalPanel(confirmationDataPanel);
@@ -227,7 +227,7 @@ function serviceManagementActionClickHandler( action, serviceName ) {
   };
 
   var confirmationDataPanelYesPanel = {
-    value: 'Yes, I\'m Super-Duper Sure',
+    value: 'Yes',
     action: function (e) {
       e.preventDefault();
       performServiceManagement( action, serviceName, confirmationDataPanel );