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/02 00:46:53 UTC
svn commit: r1345380 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/html/clusters.php hmc/html/index.php hmc/html/manageServices.php
hmc/js/clusters.js hmc/js/clustersList.js hmc/js/manageServices.js
hmc/php/conf/MessageResources-en.inc
Author: vikram
Date: Fri Jun 1 22:46:52 2012
New Revision: 1345380
URL: http://svn.apache.org/viewvc?rev=1345380&view=rev
Log:
AMBARI-310. Externalize message resources for the welcome page. Update styles on various pages (Contributed by Yusaku)
Added:
incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/html/clusters.php
incubator/ambari/branches/ambari-186/hmc/html/index.php
incubator/ambari/branches/ambari-186/hmc/html/manageServices.php
incubator/ambari/branches/ambari-186/hmc/js/clusters.js
incubator/ambari/branches/ambari-186/hmc/js/clustersList.js
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=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri Jun 1 22:46:52 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-310. Externalize message resources for the welcome page. Update styles on various pages. (Yusaku via Vikram)
+
AMBARI-309. Make ManageServices Show Only One Action Per Service (reznor via vgogate)
AMBARI-194. Avoid TxnProgressWidget Getting Stuck In An Infinite Loop (reznor via vgogate)
Modified: incubator/ambari/branches/ambari-186/hmc/html/clusters.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/clusters.php?rev=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/clusters.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/clusters.php Fri Jun 1 22:46:52 2012
@@ -29,17 +29,17 @@
<div id="clustersNavigationLinksDivId">
<ul id="clustersNavigationLinksListId">
<li class="clustersNavigationLinkEntry">
- <a href="../../hdp/dashboard/ui/home.html">
- Monitoring Dashboard
+ <a class="btn" href="../../hdp/dashboard/ui/home.html">
+ Monitoring
</a>
</li>
<li class="clustersNavigationLinkEntry">
- <a href="../html/manageServices.php?clusterName=<?php echo $_GET['clusterName']; ?>">
- Start/Stop/Reconfigure Services
+ <a class="btn" href="../html/manageServices.php?clusterName=<?php echo $_GET['clusterName']; ?>">
+ Manage Services
</a>
</li>
<li class="clustersNavigationLinkEntry">
- <a href="../html/uninstallWizard.php?clusterName=<?php echo $_GET['clusterName']; ?>">
+ <a class="btn" href="../html/uninstallWizard.php?clusterName=<?php echo $_GET['clusterName']; ?>">
Uninstall
</a>
</li>
Modified: incubator/ambari/branches/ambari-186/hmc/html/index.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/index.php?rev=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/index.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/index.php Fri Jun 1 22:46:52 2012
@@ -13,10 +13,12 @@
<body>
<?php require "./topnav.htmli"; ?>
- <div id="ContentDivId" class="yui3-skin-sam">
-
+ <div id="ContentDivId" class="yui3-skin-sam">
+ <div id="welcomeDivId" style="display:none">
+ <?php require "./welcome.inc" ?>
+ </div>
<!-- List of clusters -->
- <div id="clustersListDivId">
+ <div id="clustersListDivId" style="display:none">
</div>
</div>
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=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/manageServices.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/manageServices.php Fri Jun 1 22:46:52 2012
@@ -72,9 +72,6 @@
-->
</div>
</ul>
-
- <br/>
-
<div id="serviceManagementGlobalActionsDivId" style="display:none">
<button class="btn btn-large" id="serviceManagementGlobalActionsStartAllButtonId" name="startAll" style="margin-right:10px"><i class="iconic-play" style="margin-right:10px"></i>Start All</button>
<button class="btn btn-large" id="serviceManagementGlobalActionsStopAllButtonId" name="stopAll"><i class="iconic-stop" style="margin-right:10px"></i>Stop All</button>
Modified: incubator/ambari/branches/ambari-186/hmc/js/clusters.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/clusters.js?rev=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/clusters.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/clusters.js Fri Jun 1 22:46:52 2012
@@ -53,7 +53,7 @@ globalYui.io( "../php/frontend/fetchClus
clusterServicesResponseJson = globalYui.JSON.parse(o.responseText);
}
catch (e) {
- alert("JSON Parse failed!");
+ alert("JSON Parse failed");
return;
}
@@ -69,14 +69,12 @@ globalYui.io( "../php/frontend/fetchClus
}
else {
- alert("Zoinks! Fetching Cluster Services failed!");
+ alert("Fetching Cluster Services failed");
}
},
failure: function(x, o) {
-
hideLoadingImg();
-
- alert("Async call failed!");
+ alert("Async call failed");
}
}
});
Modified: incubator/ambari/branches/ambari-186/hmc/js/clustersList.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/clustersList.js?rev=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/clustersList.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/clustersList.js Fri Jun 1 22:46:52 2012
@@ -51,7 +51,7 @@ function renderClusterList(Y) {
clustersListMarkup = '<h3>Cluster information</h3>';
clustersListMarkup += '<div class="clusterDiv">' +
'<div class="formElement">' +
- '<label>ClusterName</label>' +
+ '<label>Cluster Name</label>' +
'<input type=text readonly=readonly value=' + clusterName + '>' +
'</div>' +
'<div class="formElement">' +
@@ -59,33 +59,24 @@ function renderClusterList(Y) {
'<input type=text readonly=readonly value=' + clusterInfo + '>' +
'</div>' +
'<div class="formElement">' +
- '<label>Monitoring dashboard</label>' +
- '<a href="/hdp/dashboard/ui/home.html">Show Monitoring Dashboard</a>' +
- '</div>' +
- '<div class="formElement">' +
- '<label>Actions</label>' +
- '<a class="btn" href="manageServices.php?clusterName=' + clusterName + '" id="existingClusterLinkDivId">Manage services</a>' +
- '<a class="btn" style="margin-left:10px" href="addNodesWizard.php?clusterName=' + clusterName + '">Add slave nodes to cluster</a>' +
- '<a class="btn" style="margin-left:10px" href="uninstallWizard.php?clusterName=' + clusterName + '">Uninstall cluster</a>' +
+ '<a class="btn" href="/hdp/dashboard/ui/home.html">Monitoring Dashboard</a>' +
+ '<a class="btn" style="margin-left:10px" href="manageServices.php?clusterName=' + clusterName + '" id="existingClusterLinkDivId">Manage Services</a>' +
+ '<a class="btn" style="margin-left:10px" href="addNodesWizard.php?clusterName=' + clusterName + '">Add Nodes</a>' +
+ '<a class="btn" style="margin-left:10px" href="uninstallWizard.php?clusterName=' + clusterName + '">Uninstall</a>' +
'</div>' +
'</div>';
}
}
- var newClusterLinkHTML = "<div class='alert alert-info' style='margin-top:40px;padding:20px'>" +
- "<h2 style='margin-bottom:10px'>Welcome to Hortonworks Management Center!</h2>" +
- "<p>Hortonworks Management Center makes it really easy for you to install, configure, and manage your Hadoop cluster.</p>" +
- "<p>First, we'll walk you through the cluster set up with a 7-step wizard.</p>" +
- "<p><span class='label label-info'>Note</span><span style='margin-left:10px;'>Before you proceed, make sure you have performed all the pre-installation steps (REFERENCE MATERIAL HERE).</span></p>" +
- "<a class='btn btn-large' style='margin-top:20px' href='initializeCluster.php'>Let's Get Started!</a>" +
- "</div>";
+ var newClusterLinkHTML = "";
if (multipleClustersSupported || numClusters == 0) {
clustersListMarkup += newClusterLinkHTML;
+ Y.one("#welcomeDivId").setStyle('display','block');
+ return;
}
-
- // document.location.href = "initializeCluster.php";
Y.one("#clustersListDivId").setContent( clustersListMarkup );
+ Y.one("#clustersListDivId").setStyle('display', 'block');
if (Y.one('#newClusterLinkDivId') != null) {
Y.one('#newClusterLinkDivId').on('click',function (e) {
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=1345380&r1=1345379&r2=1345380&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/manageServices.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/manageServices.js Fri Jun 1 22:46:52 2012
@@ -261,7 +261,7 @@ function serviceManagementActionClickHan
* on the InstallationWizard page.
*/
confirmationDataPanelBodyContent =
- '<div id=formStatusDivId class=formStatusBar style="visibility:hidden">'+
+ '<div id=formStatusDivId class=formStatusBar style="display:none">'+
'Placeholder' +
'</div>' +
'<br/>' +
Added: incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc?rev=1345380&view=auto
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc (added)
+++ incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc Fri Jun 1 22:46:52 2012
@@ -0,0 +1,49 @@
+<?php
+$RES['app.name']="Hortonworks Management Center";
+$RES['page.title']="Hortonworks Management Center";
+$RES['page.footer.body']="Hortonworks © 2012";
+$RES['welcome.header']="Welcome to Hortonworks Management Center!";
+$RES['welcome.body']="<p>Hortonworks Management Center makes it really easy for you to install, configure, and manage your Hadoop cluster.</p><p>First, we'll walk you through the cluster set up with a 7-step wizard.</p>";
+$RES['welcome.note']="Before you proceed, make sure you have performed all the pre-installation steps (REFERENCE MATERIAL HERE).";
+$RES['welcome.submit.label']="Let's get started!";
+$RES['common.sshUsername.label']="SSH Username";
+$RES['common.sshPrivateKeyFile.label']="SSH Private Key File";
+$RES['common.hostsFile.label']="Hosts File (newline-delimited list of hostnames)";
+$RES['initWizard.createCluster.pageSummary.header']="Let's create a new Hadoop cluster";
+$RES['initWizard.createCluster.pageSummary.body']="";
+$RES['initWizard.createCluster.clusterName.label']="Name of your new cluster";
+$RES['initWizard.createCluster.submit.label']="Create Cluster";
+$RES['initWizard.addNodes.pageSummary.header']="Which nodes do you want to install Hadoop on?";
+$RES['initWizard.addNodes.pageSummary.body']="We'll use the SSH private key and a file containing a list of hostnames to perform installation on your nodes. The public key that is paired with the private key must already be installed on all the nodes.";
+$RES['initWizard.addNodes.useLocalYum.label']="Use local yum mirror instead of downloading packages from the internet";
+$RES['initWizard.addNodes.yumRepoFilePath.label']="YUM Repo File Path";
+$RES['initWizard.addNodes.apacheArtifactsDownloadUrl.label']="Apache Artifacts Download URL";
+$RES['initWizard.addNodes.gplArtifactsDownloadUrl.label']="GPL Artifacts Download URL";
+$RES['initWizard.addNodes.submit.label']="Add Nodes";
+$RES['initWizard.selectServices.pageSummary.header']="Which services do you want to install?";
+$RES['initWizard.selectServices.pageSummary.body']="We'll automatically take care of dependencies (e.g., HBase requires ZooKeeper, etc.)";
+$RES['initWizard.selectServices.submit.label']="Select Services";
+$RES['initWizard.assignMasters.pageSummary.header']="Assign Services to Nodes";
+$RES['initWizard.assignMasters.pageSummary.body']="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.";
+$RES['initWizard.assignMasters.submit.label']="Submit";
+$RES['initWizard.configureCluster.pageSummary.header']="Specify Mount Points";
+$RES['initWizard.configureCluster.pageSummary.body']="We found the following mount points on your nodes. Please confirm/modify the mount points to use for your nodes.";
+$RES['initWizard.configureCluster.customMountPoints.label']="Custom mount points";
+$RES['initWizard.configureCluster.submit.label']="Submit";
+$RES['initWizard.configureClusterAdvanced.pageSummary.header']="Customize Settings";
+$RES['initWizard.configureClusterAdvanced.pageSummary.body']="We have come up with reasonable default settings. Customize as you see fit.";
+$RES['initWizard.configureClusterAdvanced.submit.label']="Submit";
+$RES['initWizard.reviewAndDeploy.pageSummary.header']="Review and Deploy";
+$RES['initWizard.reviewAndDeploy.pageSummary.body']="<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>";
+$RES['initWizard.reviewAndDeploy.submit.label']='Deploy';
+$RES['addNodesWizard.addNodes.pageSummary.header']="Which nodes are you adding to the cluster?";
+$RES['addNodesWizard.addNodes.pageSummary.body']="We'll use the SSH private key and a file containing a list of hostnames to perform installation on your nodes. The public key that is paired with the private key must already be installed on all the nodes.";
+$RES['addNodesWizard.addNodes.submit.label']="Add Nodes";
+$RES['addNodesWizard.selectServices.pageSummary.header']='Which services do you want to install?';
+$RES['addNodesWizard.selectServices.pageSummary.body']="Some services are installed by default.";
+$RES['addNodesWizard.selectServices.submit.label']="Deploy";
+$RES['uninstallWizard.pageSummary.header']="Uninstall Cluster";
+$RES['uninstallWizard.pageSummary.body']="<span class='label label-important'>Warning</span> This will delete all services and data on all of your nodes in the cluster.";
+$RES['uninstallWizard.submit.label']="Uninstall services and data from all nodes";
+
+?>
\ No newline at end of file