[fluo-website] branch gh-pages updated: Update site to satisfy Whimsy site check (#157)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/fluo-website.git


The following commit(s) were added to refs/heads/gh-pages by this push:
     new 5892caf  Update site to satisfy Whimsy site check (#157)
5892caf is described below

commit 5892caf3e0a79fdd8af9cc1b248d77d88bc379f6
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Apr 11 15:48:21 2018 -0400

    Update site to satisfy Whimsy site check (#157)
    
    To satisfy https://whimsy.apache.org/site/project/fluo
    
    * Add Events link to menu and image to body of page
    * Fix trademarks footer
    * Fix license link
---
 _layouts/default.html | 31 +++++++++++++++++++++++--------
 css/fluo.scss         | 30 ++++++++++++++++++++++++------
 index.html            |  5 +++++
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index 1cbf262..89c754c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -65,11 +65,12 @@
               <a class="dropdown-toggle" data-toggle="dropdown" 
href="#">Apache Software Foundation<span class="caret"></span></a>
               <ul class="dropdown-menu">
                 <li><a href="https://www.apache.org";>Apache Homepage</a></li>
-                <li><a 
href="https://www.apache.org/licenses/LICENSE-2.0";>License</a></li>
+                <li><a href="https://www.apache.org/licenses/";>License</a></li>
                 <li><a 
href="https://www.apache.org/foundation/sponsorship";>Sponsorship</i></a></li>
                 <li><a href="https://www.apache.org/security";>Security</a></li>
                 <li><a 
href="https://www.apache.org/foundation/thanks";>Thanks</a></li>
                 <li><a 
href="https://www.apache.org/foundation/policies/conduct";>Code of 
Conduct</a></li>
+                <li><a 
href="https://www.apache.org/events/current-event.html";>Current Event</a></li>
               </ul>
             </li>
           </ul>
@@ -82,13 +83,27 @@
             {{ content }}
           </div>
       </div>
-      <hr>
-      <div class="row footer">
-        <div class="col-sm-12 text-center">
-          <div class="center-block">
-          <a href="https://apache.org";><img src="{{ site.baseurl 
}}/resources/feather.png" alt="Apache"></a>
-          Copyright &copy; {{ site.time | date: '%Y' }} The Apache Software 
Foundation. Licensed under the <a 
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
-          </div>
+      <div class="row">
+        <div class="col-sm-12 center-block">
+          <footer>
+            <hr/>
+            <p>
+            <a href="https://www.apache.org/foundation/contributing";><img
+              src="https://www.apache.org/images/SupportApache-small.png";
+              id="asf-logo" height="100" alt="Apache"/></a>
+            </p>
+            <p>
+            Copyright &copy; {{ site.time | date: '%Y' }} <a
+              
href="https://www.apache.org";>The&nbsp;Apache&nbsp;Software&nbsp;Foundation</a>.
+            Licensed under the <a
+              
href="https://www.apache.org/licenses/";>Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
+            </p>
+            <p>
+            Apache®, the names of Apache projects and their logos, and the 
multicolor feather
+            logo are registered trademarks or trademarks of The Apache 
Software Foundation
+            in the United States and/or other countries.
+            </p>
+          </footer>
         </div>
       </div>
     </div>
diff --git a/css/fluo.scss b/css/fluo.scss
index 6e0d93d..691e58d 100644
--- a/css/fluo.scss
+++ b/css/fluo.scss
@@ -13,13 +13,13 @@ th, td {
   border-bottom: 1px solid #ddd;
 }
 
-p { 
+p {
   line-height: 25px;
   padding-top: 5px;
   font-size: 16px;
 }
 
-li { 
+li {
   line-height: 25px;
 }
 
@@ -47,10 +47,28 @@ tr:nth-child(odd) {background: #FFF}
   }
 }
 
-.footer {
-  margin: 10px 0 30px;
-  font-size: 12px;
+footer {
+    margin: 10px 0 30px;
   color: #aaa;
+  padding: 8px 8px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+footer > hr {
+  width: 80%;
+}
+
+footer > p {
+  line-height: 1.5em;
+  padding-top: 1em;
+  font-size: 12px;
+  width: 60%;
+  margin: auto;
+}
+
+#asf-logo {
+  float: left;
 }
 
 // index.html
@@ -79,7 +97,7 @@ tr:nth-child(odd) {background: #FFF}
   margin-bottom: 20px;
 }
 
-// page 
+// page
 #page-content {
   margin-top: 20px;
 }
diff --git a/index.html b/index.html
index b284bbe..f99db1a 100644
--- a/index.html
+++ b/index.html
@@ -33,6 +33,11 @@ html_title_override: true
         </div>
       </div>
     </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <a id="asf-current-event-logo" 
href="https://www.apache.org/events/current-event.html";><img alt="ASF Current 
Events" class="img-responsive center-block" 
src="https://www.apache.org/events/current-event-234x60.png"/></a>
+      </div>
+    </div>
   </div>
 </div>
 

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.