Pārlūkot izejas kodu

AMBARI-592. Add a link to NOTICE file on every page (Contributed by yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1357021 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 13 gadi atpakaļ
vecāks
revīzija
2a59a6db2f

+ 2 - 0
CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 1.0.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,

+ 6 - 4
NOTICE.txt

@@ -4,15 +4,17 @@ Copyright 2012 The Apache Software Foundation
 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
-

+ 6 - 0
hmc/css/app.css

@@ -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 {

+ 1 - 0
hmc/html/installFailed.php

@@ -34,5 +34,6 @@
         </div>
       </div>
     </div>
+    <?php require "./footer.htmli"; ?>
   </body>
 </html>

+ 1 - 0
hmc/html/reinstall.php

@@ -34,5 +34,6 @@
         </div>
       </div>
     </div>
+    <?php require "./footer.htmli"; ?>
   </body>
 </html>

+ 1 - 0
hmc/html/uninstallFailed.php

@@ -36,5 +36,6 @@
         </div>
       </div>
     </div>
+    <?php require "./footer.htmli"; ?>
   </body>
 </html>

+ 1 - 0
hmc/html/welcome.php

@@ -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>

BIN
hmc/images/glyphicons-halflings-white.png


BIN
hmc/images/glyphicons-halflings.png


+ 1 - 1
hmc/package/rpm/create_hmc_rpm.sh

@@ -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};

+ 1 - 1
hmc/php/conf/MessageResources-en.inc

@@ -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']="";