You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/03/25 15:27:30 UTC
[32/50] git commit: [#7274] Add Apache Allura trademark and copyright
info
[#7274] Add Apache Allura trademark and copyright info
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ce89f95e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ce89f95e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ce89f95e
Branch: refs/heads/db/5995
Commit: ce89f95e16d73c2a26642d2238abca5134596751
Parents: abfcaa6
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Fri Mar 14 17:56:07 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Fri Mar 14 18:47:34 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/theme_macros.html | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ce89f95e/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index c93d408..f188692 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -36,7 +36,12 @@
{%- macro footer(year, path_to_static='') %}
<footer id="site-footer">
<nav>
- This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Allura</a>.
+ <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura (incubating)</a>.</p>
+ <p>
+ Copyright © 2014 The Apache Software Foundation, Licensed under the
+ <a style="color: #069;" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+ Apache, Allura, Apache Allura, and the Apache feather logo are trademarks of The Apache Software Foundation.
+ </p>
</nav>
</footer>
{%- endmacro %}