You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/07/04 02:30:39 UTC
svn commit: r1357023 - in /incubator/ambari/branches/branch-0.9: ./ hmc/css/
hmc/html/ hmc/images/ hmc/package/rpm/ hmc/php/conf/
Author: yusaku
Date: Wed Jul 4 00:30:38 2012
New Revision: 1357023
URL: http://svn.apache.org/viewvc?rev=1357023&view=rev
Log:
AMBARI-592. Add a link to NOTICE file on every page (Contributed by yusaku)
Removed:
incubator/ambari/branches/branch-0.9/hmc/images/glyphicons-halflings-white.png
incubator/ambari/branches/branch-0.9/hmc/images/glyphicons-halflings.png
Modified:
incubator/ambari/branches/branch-0.9/CHANGES.txt
incubator/ambari/branches/branch-0.9/NOTICE.txt
incubator/ambari/branches/branch-0.9/hmc/css/app.css
incubator/ambari/branches/branch-0.9/hmc/html/installFailed.php
incubator/ambari/branches/branch-0.9/hmc/html/reinstall.php
incubator/ambari/branches/branch-0.9/hmc/html/uninstallFailed.php
incubator/ambari/branches/branch-0.9/hmc/html/welcome.php
incubator/ambari/branches/branch-0.9/hmc/package/rpm/create_hmc_rpm.sh
incubator/ambari/branches/branch-0.9/hmc/php/conf/MessageResources-en.inc
Modified: incubator/ambari/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/CHANGES.txt?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-0.9/CHANGES.txt Wed Jul 4 00:30:38 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.9.0 - unreleased
+ AMBARI-592. Add a link to NOTICE file on every page (yusaku)
+
More notices added for jqgrid etc. (vikram)
AMBARI-591. License header for PHP files should use PHP comments,
Modified: incubator/ambari/branches/branch-0.9/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/NOTICE.txt?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/NOTICE.txt (original)
+++ incubator/ambari/branches/branch-0.9/NOTICE.txt Wed Jul 4 00:30:38 2012
@@ -4,15 +4,17 @@ Copyright 2012 The Apache Software Found
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
-This product includes YUI (http://yuilibrary.com)
+This product includes YUI (http://yuilibrary.com - BSD License)
Copyright (c) 2012, Yahoo! Inc.
-This product includes jquery (http://jquery.org MIT license)
-Copyright (c) 2012 John Resig.
+This product includes jQuery (http://jquery.org - MIT license)
+Copyright (c) 2012, John Resig.
+
+This product includes Iconic (http://somerandomdude.com/work/iconic -
+Creative Commons Share Alike 3.0) by P.J. Onori.
This product includes jqgrid (http://www.triand.com/)
Copyright (c) 2007-2012 jQuery Grid Plugin - jqGrid
This product includes raphael (http://raphaeljs.com/)
Copyright (c) 2008 Dmitry Baranovskiy
-
Modified: incubator/ambari/branches/branch-0.9/hmc/css/app.css
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/css/app.css?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/css/app.css (original)
+++ incubator/ambari/branches/branch-0.9/hmc/css/app.css Wed Jul 4 00:30:38 2012
@@ -61,6 +61,12 @@ footer {
border-top:1px solid #e5e5e5;
padding:40px 0;
background-color:#fff;
+ color:#666666;
+}
+
+footer a:link, footer a:visited {
+ color:#666666;
+ text-decoration:underline;
}
a:link {
Modified: incubator/ambari/branches/branch-0.9/hmc/html/installFailed.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/html/installFailed.php?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/html/installFailed.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/html/installFailed.php Wed Jul 4 00:30:38 2012
@@ -34,5 +34,6 @@
</div>
</div>
</div>
+ <?php require "./footer.htmli"; ?>
</body>
</html>
Modified: incubator/ambari/branches/branch-0.9/hmc/html/reinstall.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/html/reinstall.php?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/html/reinstall.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/html/reinstall.php Wed Jul 4 00:30:38 2012
@@ -34,5 +34,6 @@
</div>
</div>
</div>
+ <?php require "./footer.htmli"; ?>
</body>
</html>
Modified: incubator/ambari/branches/branch-0.9/hmc/html/uninstallFailed.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/html/uninstallFailed.php?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/html/uninstallFailed.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/html/uninstallFailed.php Wed Jul 4 00:30:38 2012
@@ -36,5 +36,6 @@
</div>
</div>
</div>
+ <?php require "./footer.htmli"; ?>
</body>
</html>
Modified: incubator/ambari/branches/branch-0.9/hmc/html/welcome.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/html/welcome.php?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/html/welcome.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/html/welcome.php Wed Jul 4 00:30:38 2012
@@ -35,5 +35,6 @@
<a id="submitLinkId" class='btn btn-large' style='margin-top:20px' href='initializeCluster.php'><?php echo $RES['welcome.submit.label'] ?></a>
</div>
</div>
+ <?php require "./footer.htmli"; ?>
</body>
</html>
Modified: incubator/ambari/branches/branch-0.9/hmc/package/rpm/create_hmc_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/package/rpm/create_hmc_rpm.sh?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/package/rpm/create_hmc_rpm.sh (original)
+++ incubator/ambari/branches/branch-0.9/hmc/package/rpm/create_hmc_rpm.sh Wed Jul 4 00:30:38 2012
@@ -52,10 +52,10 @@ cp -rf ${BASEDIR}/../../js ${HMC_DIR}
#cp -rf ${BASEDIR}/../../src/puppet ${HMC_DIR}
cp -rf ${BASEDIR}/../../puppet ${HMC_DIR}
cp -rf ${BASEDIR}/../../php ${HMC_DIR}
-cp -rf ${BASEDIR}/../../yui-3.5.1 ${HMC_DIR}
cp -rf ${BASEDIR}/../../conf ${HMC_DIR}
cp -rf ${BASEDIR}/../../fonts ${HMC_DIR}
cp -f ${BASEDIR}/../../fileCombinator.php ${HMC_DIR}
+cp -f ${BASEDIR}/../../../NOTICE.txt ${HMC_DIR}/licenses
TAR_DEST="${BUILD_DIR}/${PKG_NAME}-$VERSION.tar.gz"
cd ${BUILD_DIR};
Modified: incubator/ambari/branches/branch-0.9/hmc/php/conf/MessageResources-en.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/php/conf/MessageResources-en.inc?rev=1357023&r1=1357022&r2=1357023&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/php/conf/MessageResources-en.inc (original)
+++ incubator/ambari/branches/branch-0.9/hmc/php/conf/MessageResources-en.inc Wed Jul 4 00:30:38 2012
@@ -22,7 +22,7 @@
$RES['app.name']="Ambari";
$RES['page.title']="Ambari";
-$RES['page.footer.body']="";
+$RES['page.footer.body']="<a href='http://www.apache.org/licenses/LICENSE-2.0' target='_blank'>Licensed under the Apache License, Version 2.0</a>.<br><a href='/hmc/licenses/NOTICE.txt' target='_blank'>See third-party tools/resources that Ambari uses and their respective authors</a>";
$RES['topnav.help.link']="http://incubator.apache.org/ambari/install.html";
$RES['welcome.header']="Welcome to Ambari!";
$RES['welcome.body']="";