You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ra...@apache.org on 2012/05/17 20:57:42 UTC
svn commit: r1339795 - in /incubator/ambari/branches/ambari-186: ./
hmc/html/ hmc/images/ hmc/js/ hmc/js/ext/
Author: ramya
Date: Thu May 17 18:57:41 2012
New Revision: 1339795
URL: http://svn.apache.org/viewvc?rev=1339795&view=rev
Log:
AMBARI-255. Rename/Relocate files as appropriate
Added:
incubator/ambari/branches/ambari-186/hmc/html/footer.htmli
- copied unchanged from r1339752, incubator/ambari/branches/ambari-186/hmc/html/footer.html
incubator/ambari/branches/ambari-186/hmc/html/header.htmli
- copied unchanged from r1339752, incubator/ambari/branches/ambari-186/hmc/html/header.html
incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli
- copied unchanged from r1339752, incubator/ambari/branches/ambari-186/hmc/html/topnav.html
incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif (with props)
incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif (with props)
incubator/ambari/branches/ambari-186/hmc/images/logo.jpg
- copied, changed from r1339752, incubator/ambari/branches/ambari-186/hmc/html/logo.jpg
incubator/ambari/branches/ambari-186/hmc/js/ext/
incubator/ambari/branches/ambari-186/hmc/js/ext/bootstrap.min.js
- copied unchanged from r1339752, incubator/ambari/branches/ambari-186/hmc/js/bootstrap.min.js
incubator/ambari/branches/ambari-186/hmc/js/ext/jquery.min.js
- copied unchanged from r1339752, incubator/ambari/branches/ambari-186/hmc/js/jquery.min.js
Removed:
incubator/ambari/branches/ambari-186/hmc/html/footer.html
incubator/ambari/branches/ambari-186/hmc/html/header.html
incubator/ambari/branches/ambari-186/hmc/html/logo.jpg
incubator/ambari/branches/ambari-186/hmc/html/topnav.html
incubator/ambari/branches/ambari-186/hmc/js/bootstrap.min.js
incubator/ambari/branches/ambari-186/hmc/js/jquery.min.js
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
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/initializeCluster.php
incubator/ambari/branches/ambari-186/hmc/html/manageServices.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu May 17 18:57:41 2012
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.x.x - unreleased
+ AMBARI-255. Rename/Relocate files as appropriate (Varun Kapoor via ramya)
+
AMBARI-252. Remove Playground files from HMC (Varun Kapoor via ramya)
AMBARI-266. add select/unselect all buttons to the select services page
Modified: incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php?rev=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php Thu May 17 18:57:41 2012
@@ -13,7 +13,7 @@
</head>
<body class="yui3-skin-sam">
- <?php require "./topnav.html"; ?>
+ <?php require "./topnav.htmli"; ?>
<div id="ContentDivId">
@@ -100,7 +100,7 @@
<!-- End of installation Wizard -->
</div>
- <?php require "./footer.html"; ?>
+ <?php require "./footer.htmli"; ?>
<!-- Javascript Scaffolding -->
<script type="text/javascript">
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=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/clusters.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/clusters.php Thu May 17 18:57:41 2012
@@ -9,11 +9,12 @@
<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/clusters.css" media="screen"/>
+ <link rel="shortcut icon" href="../images/logo-micro.gif">
<!-- End CSS -->
</head>
<body class="yui3-skin-sam">
- <?php require "./topnav.html"; ?>
+ <?php require "./topnav.htmli"; ?>
<h1> Cluster <?php echo $_GET['clusterName']; ?> </h1>
@@ -57,7 +58,7 @@
</div>
<!-- End of contentDivId -->
- <?php require "./footer.html"; ?>
+ <?php require "./footer.htmli"; ?>
<!-- Javascript Scaffolding -->
<script type="text/javascript">
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=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/index.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/index.php Thu May 17 18:57:41 2012
@@ -11,7 +11,7 @@
</head>
<body>
- <?php require "./topnav.html"; ?>
+ <?php require "./topnav.htmli"; ?>
<div id="ContentDivId" class="yui3-skin-sam">
@@ -35,6 +35,6 @@
<script src="../js/utils.js"></script>
<script src="../js/clustersList.js"></script>
- <?php require "./footer.html"; ?>
+ <?php require "./footer.htmli"; ?>
</body>
</html>
Modified: incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php?rev=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php Thu May 17 18:57:41 2012
@@ -13,7 +13,7 @@
</head>
<body class="yui3-skin-sam">
- <?php require "./topnav.html"; ?>
+ <?php require "./topnav.htmli"; ?>
<div id="ContentDivId">
@@ -253,7 +253,7 @@
</div>
<!-- End of installation Wizard -->
</div>
- <?php require "./footer.html"; ?>
+ <?php require "./footer.htmli"; ?>
<!-- Javascript Scaffolding -->
<script type="text/javascript">
@@ -283,8 +283,8 @@
};
var jsFilesToLoad = [
- '../js/jquery.min.js',
- '../js/bootstrap.min.js',
+ '../js/ext/jquery.min.js',
+ '../js/ext/bootstrap.min.js',
'../js/utils.js',
'../js/txnUtils.js',
'../js/installationWizard.js',
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=1339795&r1=1339794&r2=1339795&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/manageServices.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/manageServices.php Thu May 17 18:57:41 2012
@@ -13,7 +13,7 @@
</head>
<body class="yui3-skin-sam">
- <?php require "./topnav.html"; ?>
+ <?php require "./topnav.htmli"; ?>
<div id="ContentDivId">
@@ -90,7 +90,7 @@
</div>
<!-- End of contentDivId -->
- <?php require "./footer.html"; ?>
+ <?php require "./footer.htmli"; ?>
<!-- Javascript Scaffolding -->
<script type="text/javascript">
Added: incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif?rev=1339795&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif?rev=1339795&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: incubator/ambari/branches/ambari-186/hmc/images/logo.jpg (from r1339752, incubator/ambari/branches/ambari-186/hmc/html/logo.jpg)
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo.jpg?p2=incubator/ambari/branches/ambari-186/hmc/images/logo.jpg&p1=incubator/ambari/branches/ambari-186/hmc/html/logo.jpg&r1=1339752&r2=1339795&rev=1339795&view=diff
==============================================================================
Binary files - no diff available.