You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 00:09:48 UTC
svn commit: r1347167 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/html/installFailed.php hmc/html/reinstall.php hmc/html/welcome.php
hmc/js/manageServices.js
Author: vikram
Date: Wed Jun 6 22:09:47 2012
New Revision: 1347167
URL: http://svn.apache.org/viewvc?rev=1347167&view=rev
Log:
AMBARI-392. Add ID attributes to HTML tags to help test automation (Contributed by Yusaku)
Added:
incubator/ambari/branches/ambari-186/hmc/html/welcome.php
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/html/installFailed.php
incubator/ambari/branches/ambari-186/hmc/html/reinstall.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=1347167&r1=1347166&r2=1347167&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun 6 22:09:47 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-392. Add ID attributes to HTML tags to help test automation (Yusaku via Vikram)
+
AMBARI-358. Make index.php always accessible, rather than automatically forwarding to the action, even if there's only one action that the user can take (Yusaku via Vikram)
AMBARI-390. Handle multiple ZooKeeper service masters in Assign Masters page (Yusaku via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/html/installFailed.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/installFailed.php?rev=1347167&r1=1347166&r2=1347167&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/installFailed.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/installFailed.php Wed Jun 6 22:09:47 2012
@@ -20,7 +20,7 @@
<div class="alert alert-important" style="margin-top:40px;padding:20px">
<h2 style="margin-bottom:10px"><?php echo $RES['installFailed.header'] ?></h2>
<p><?php echo $RES['installFailed.body'] ?></p>
- <a class='btn btn-large' style='margin-top:20px' href='uninstallWizard.php'><?php echo $RES['installFailed.submit.label'] ?></a>
+ <a id="submitLinkId" class='btn btn-large' style='margin-top:20px' href='uninstallWizard.php'><?php echo $RES['installFailed.submit.label'] ?></a>
</div>
</div>
</div>
Modified: incubator/ambari/branches/ambari-186/hmc/html/reinstall.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/reinstall.php?rev=1347167&r1=1347166&r2=1347167&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/reinstall.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/reinstall.php Wed Jun 6 22:09:47 2012
@@ -20,7 +20,7 @@
<div class="alert alert-important" style="margin-top:40px;padding:20px">
<h2 style="margin-bottom:10px"><?php echo $RES['reinstall.header'] ?></h2>
<p><?php echo $RES['reinstall.body'] ?></p>
- <a class='btn btn-large' style='margin-top:20px' href='initializeCluster.php'><?php echo $RES['reinstall.submit.label'] ?></a>
+ <a id="submitLinkId" class='btn btn-large' style='margin-top:20px' href='initializeCluster.php'><?php echo $RES['reinstall.submit.label'] ?></a>
</div>
</div>
</div>
Added: incubator/ambari/branches/ambari-186/hmc/html/welcome.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/welcome.php?rev=1347167&view=auto
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/welcome.php (added)
+++ incubator/ambari/branches/ambari-186/hmc/html/welcome.php Wed Jun 6 22:09:47 2012
@@ -0,0 +1,29 @@
+<?php require_once "./head.inc"; ?>
+<html>
+ <head>
+ <title id="pageTitleId"><?php echo $RES['page.title'] ?></title>
+
+ <!-- CSS -->
+ <link type="text/css" rel="stylesheet" href="../yui-3.5.1/build/cssreset/cssreset-min.css">
+ <link type="text/css" rel="stylesheet" href="../css/bootstrap.css" media="screen"/>
+ <link type="text/css" rel="stylesheet" href="../css/common.css" media="screen"/>
+ <link type="text/css" rel="stylesheet" href="../css/common2.css" media="screen"/>
+ <link type="text/css" rel="stylesheet" href="../css/common3.css" media="screen"/>
+ <link type="text/css" rel="stylesheet" href="../css/selectHosts.css" media="screen"/>
+ <link rel="shortcut icon" href="../images/logo-micro.gif">
+ <!-- End CSS -->
+ </head>
+
+ <body class="yui3-skin-sam">
+ <?php require "./topnav.htmli"; ?>
+
+ <div id="ContentDivId">
+ <div class="alert alert-info" style="margin-top:40px;padding:20px">
+ <h2 style="margin-bottom:10px"><?php echo $RES['welcome.header'] ?></h2>
+ <p><?php echo $RES['welcome.body'] ?></p>
+ <p><span class='label label-info'>Note</span><span style='margin-left:10px;'><?php echo $RES['welcome.note'] ?></span></p>
+ <a id="submitLinkId" class='btn btn-large' style='margin-top:20px' href='initializeCluster.php'><?php echo $RES['welcome.submit.label'] ?></a>
+ </div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
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=1347167&r1=1347166&r2=1347167&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/manageServices.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/manageServices.js Wed Jun 6 22:09:47 2012
@@ -349,18 +349,17 @@ function performServiceManagement( actio
success:
'<p>' +
- 'Yabba Dabba Doo! Manage services ' +
+ 'Successfully completed the operation. ' +
'<a href="javascript:void(null)" id=closeManageServicesProgressWidgetLinkId>' +
- 'even harder' +
- '</a>' +
- '?' +
+ 'Continue' +
+ '</a>' +
'</p>',
failure:
'<p>' +
- 'Scooby Doo, where are you? Perhaps in the ' +
- '<a href="javascript:void(null)" id=showManageServicesTxnLogsLinkId>Operation Logs</a>' +
- '?' +
+ 'Failed to complete the operation. Please ' +
+ '<a href="javascript:void(null)" id=showManageServicesTxnLogsLinkId>take a look at Operation Logs</a>' +
+ ' to see what might have gone wrong.' +
'</p>'
};
@@ -586,7 +585,7 @@ function generateServiceManagementEntryM
generatedServiceManagementEntryMarkup +=
'<li class="serviceManagementEntry '+ serviceManagementEntryCssClass + '">' +
- '<div>' +
+ '<div id="serviceManagementFor' + serviceName + '">' +
'<span class="serviceManagementEntryNameContainer">' +
'<a href="javascript:void(null)" name="' + serviceName + '" class="serviceManagementEntryName">' +
serviceInfo.displayName +