You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/05 14:16:38 UTC

incubator-juneau-website git commit: Various branding fixes.

Repository: incubator-juneau-website
Updated Branches:
  refs/heads/asf-site 98206f05a -> 9eef800c0


Various branding fixes.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/9eef800c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/9eef800c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/9eef800c

Branch: refs/heads/asf-site
Commit: 9eef800c033d7b8c05d4dadfafa0355d8ab7e4fe
Parents: 98206f0
Author: JamesBognar <ja...@apache.org>
Authored: Thu Oct 5 10:16:29 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Thu Oct 5 10:16:29 2017 -0400

----------------------------------------------------------------------
 content/about.html         |  2 +-
 content/index.html         | 11 ++++++++---
 content/issueTracking.html | 27 ---------------------------
 content/issues.html        | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9eef800c/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index c6bb23c..f3c91c7 100644
--- a/content/about.html
+++ b/content/about.html
@@ -15,7 +15,7 @@
 	<h5 class='toc'>1 - About</h5>
 	<div>
 		<p>
-			A single cohesive framework consisting of the following parts:
+			Apache Juneau&trade; is a single cohesive framework consisting of the following parts:
 		</p>
 		<ul class='spaced-list'>
 			<li>A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9eef800c/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 922e28a..3a2cee0 100644
--- a/content/index.html
+++ b/content/index.html
@@ -131,7 +131,7 @@
 
 	<header id='header'>
 	   <img src='images/juneau2.png' style='position:absolute;left:20px;height:50px;top:10px'>
-	   <span style='vertical-align: top;color: #cc1b1b; font-weight: lighter; padding-left: 100px'>APACHE JUNEAU</span>
+	   <span style='vertical-align: top;color: #cc1b1b; font-weight: lighter; padding-left: 100px'>APACHE JUNEAU <small>&trade;</small></span>
 	   <span style='vertical-align: top;color: #cc1b1b; font-size: 12pt; font-weight: lighter'>(incubating)</span>
 	   <img src='images/incubator_feather_egg_logo3.png' style='position:absolute;right:20px;height:50px;top:10px'>
 	</header>
@@ -142,9 +142,13 @@
 			<li><a href='documentation.html' id='documentation' onclick="return select(this)">Documentation</a></li>
 			<li><a href='downloads.html' id='downloads' onclick="return select(this)">Downloads</a></li>
 			<li><a href='sourceCode.html' id='sourceCode' onclick="return select(this)">Source Code</a></li>
-			<li><a href='issueTracking.html' id='issueTracking' onclick="return select(this)">Issue Tracking</a></li>
+			<li><a href='issues.html' id='issues' onclick="return select(this)">Issues</a></li>
 			<li><a href='community.html' id='community' onclick="return select(this)">Community</a></li>
 			<li><a href='twitter.html' id='twitter' onclick="return select(this)">Twitter</a></li>
+			<li><a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">License</a></li>
+			<li><a href="http://www.apache.org/security" target="_blank">Security</a></li>
+			<li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Donate</a></li>
+			<li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
 		</ul>
 	</nav>
 
@@ -172,7 +176,8 @@
 		</table>
 		<p>
 			Copyright &copy; 2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-			<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+			<br>Apache, Apache Juneau, and the Apache feather logo are trademarks of The Apache Software Foundation.
+			Eclipse is a registered trademark of the Eclipse Foundation. 
 		</p>
 	</footer>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9eef800c/content/issueTracking.html
----------------------------------------------------------------------
diff --git a/content/issueTracking.html b/content/issueTracking.html
deleted file mode 100644
index 60fb1f9..0000000
--- a/content/issueTracking.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<h5 class='toc'>Issue Tracking</h5>
-	<p>
-		Juneau has no bugs.  However, in the <i>extremely unlikely</i> event that you happen to find a bug, please report it at the JIRA repository listed below.
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='https://issues.apache.org/jira/browse/JUNEAU' target="_top">JIRA</a>
-	</ul>
-	<p>
-		External developers should use the following categories for requests:
-	</p>
-	<ul class='spaced-list'>
-		<li><l>Bug</l> - Broken functionality.
-		<li><l>Feature Request</l> - Requests for brand new functionality.
-		<li><l>Improvement</l> - Requests for improvements to existing functionality.
-		<li><l>Wish</l> - Trivial requests.
-	</ul>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9eef800c/content/issues.html
----------------------------------------------------------------------
diff --git a/content/issues.html b/content/issues.html
new file mode 100644
index 0000000..ebd0806
--- /dev/null
+++ b/content/issues.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+	@import url("styles/juneau-code.css");
+	@import url("styles/juneau-doc.css");
+</style>
+</head>
+<body>
+	<h5 class='toc'>Issues</h5>
+	<p>
+		Juneau has no bugs.  However, in the <i>extremely unlikely</i> event that you happen to find a bug, please report it at the JIRA repository listed below.
+	</p>
+	<ul class='spaced-list'>
+		<li><a class='doclink' href='https://issues.apache.org/jira/browse/JUNEAU' target="_top">JIRA</a>
+	</ul>
+	<p>
+		External developers should use the following categories for requests:
+	</p>
+	<ul class='spaced-list'>
+		<li><l>Bug</l> - Broken functionality.
+		<li><l>Feature Request</l> - Requests for brand new functionality.
+		<li><l>Improvement</l> - Requests for improvements to existing functionality.
+		<li><l>Wish</l> - Trivial requests.
+	</ul>
+	<h5 class='toc'>Security Vulnerabilities</h5>
+	<p>
+		If you discover any security vulnerabilities in this code, please refer to the instructions found here:
+	</p>
+	<ul class='spaced-list'>
+		<li><a class='doclink' href='http://www.apache.org/security'>SECURITY</a>
+	</ul>
+</body>
+</html>