Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA7DDCDE2 for ; Thu, 17 May 2012 16:55:06 +0000 (UTC) Received: (qmail 58609 invoked by uid 500); 17 May 2012 16:55:06 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 58589 invoked by uid 500); 17 May 2012 16:55:06 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 58581 invoked by uid 99); 17 May 2012 16:55:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 16:55:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 16:55:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4871523889E0; Thu, 17 May 2012 16:54:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1339705 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/css/bootstrap.css hmc/css/common.css hmc/css/manageServices.css hmc/html/manageServices.php hmc/js/manageServices.js Date: Thu, 17 May 2012 16:54:41 -0000 To: ambari-commits@incubator.apache.org From: ramya@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120517165442.4871523889E0@eris.apache.org> Author: ramya Date: Thu May 17 16:54:41 2012 New Revision: 1339705 URL: http://svn.apache.org/viewvc?rev=1339705&view=rev Log: AMBARI-296. Update styles on Service Management page. Patch 1 Modified: incubator/ambari/branches/ambari-186/CHANGES.txt incubator/ambari/branches/ambari-186/hmc/css/bootstrap.css incubator/ambari/branches/ambari-186/hmc/css/common.css incubator/ambari/branches/ambari-186/hmc/css/manageServices.css incubator/ambari/branches/ambari-186/hmc/html/manageServices.php incubator/ambari/branches/ambari-186/hmc/js/manageServices.js Modified: incubator/ambari/branches/ambari-186/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/CHANGES.txt (original) +++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu May 17 16:54:41 2012 @@ -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) Modified: incubator/ambari/branches/ambari-186/hmc/css/bootstrap.css URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/css/bootstrap.css?rev=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/hmc/css/bootstrap.css (original) +++ incubator/ambari/branches/ambari-186/hmc/css/bootstrap.css Thu May 17 16:54:41 2012 @@ -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; 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=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/hmc/css/common.css (original) +++ incubator/ambari/branches/ambari-186/hmc/css/common.css Thu May 17 16:54:41 2012 @@ -111,7 +111,6 @@ select { #installationMainFormsDivId { /* border:1px solid; */ - margin-top: 8px; display:block; } Modified: incubator/ambari/branches/ambari-186/hmc/css/manageServices.css URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/css/manageServices.css?rev=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/hmc/css/manageServices.css (original) +++ incubator/ambari/branches/ambari-186/hmc/css/manageServices.css Thu May 17 16:54:41 2012 @@ -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, Modified: incubator/ambari/branches/ambari-186/hmc/html/manageServices.php URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/manageServices.php?rev=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/hmc/html/manageServices.php (original) +++ incubator/ambari/branches/ambari-186/hmc/html/manageServices.php Thu May 17 16:54:41 2012 @@ -76,12 +76,8 @@

Modified: incubator/ambari/branches/ambari-186/hmc/js/manageServices.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/manageServices.js?rev=1339705&r1=1339704&r2=1339705&view=diff ============================================================================== --- incubator/ambari/branches/ambari-186/hmc/js/manageServices.js (original) +++ incubator/ambari/branches/ambari-186/hmc/js/manageServices.js Thu May 17 16:54:41 2012 @@ -218,7 +218,7 @@ function serviceManagementActionClickHan var confirmationDataPanel; var confirmationDataPanelNoButton = { - value: 'Nah, Forget It', + value: 'Cancel', action: function (e) { e.preventDefault(); destroyInformationalPanel(confirmationDataPanel); @@ -227,7 +227,7 @@ function serviceManagementActionClickHan }; var confirmationDataPanelYesPanel = { - value: 'Yes, I\'m Super-Duper Sure', + value: 'Yes', action: function (e) { e.preventDefault(); performServiceManagement( action, serviceName, confirmationDataPanel );