This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller-website.git
The following commit(s) were added to refs/heads/master by this push: new 0c30aa5 Improved: Added the expected links on the website as per the Apache guidelines new 515679e Merge pull request #1 from swapnilmmane/master 0c30aa5 is described below commit 0c30aa5c879089901811738e545cbdf9c853b4f5 Author: Swapnil M Mane <swapnil.m...@hotwaxsystems.com> AuthorDate: Tue Aug 13 19:27:37 2019 +0530 Improved: Added the expected links on the website as per the Apache guidelines Few specific links or text blocks are expected on the project website. Fixed the issues [1] reported by the Apache Whimsy's TLP Website Checks tool on Roller website. [1] https://whimsy.apache.org/site/project/roller --- content/downloads/downloads.html | 24 ++++++++++++++++++------ content/getinvolved/edit_website.html | 24 ++++++++++++++++++------ content/index.html | 24 ++++++++++++++++++------ content/project/whoweare.html | 24 ++++++++++++++++++------ sources/src/main/jbake/templates/footer.ftl | 13 +++++++++++-- sources/src/main/jbake/templates/header.ftl | 11 +++++++---- 6 files changed, 90 insertions(+), 30 deletions(-) diff --git a/content/downloads/downloads.html b/content/downloads/downloads.html index 3fcbef9..0eeb5c5 100644 --- a/content/downloads/downloads.html +++ b/content/downloads/downloads.html @@ -62,10 +62,13 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> - <li><a href="http://www.apache.org/foundation/">Foundation</a></li> - <li><a href="http://projects.apache.org/">Projects</a></li> - <li><a href="http://people.apache.org/">People</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html">Support Apache</a></li> + <li><a href="https://www.apache.org/foundation/" target="external">Foundation</a></li> + <li><a href="https://www.apache.org/events/current-event" target="external">Events</a></li> + <li><a href="https://projects.apache.org/" target="external">Projects</a></li> + <li><a href="https://people.apache.org/" target="external">People</a></li> + <li><a href="https://www.apache.org/foundation/sponsorship.html" target="external">Sponsorship</a></li> + <li><a href="https://www.apache.org/foundation/thanks.html" target="external">Thanks</a></li> + <li><a href="https://www.apache.org/licenses/" target="external">License</a></li> </ul> </li> </ul> @@ -108,8 +111,17 @@ <div class="container"> <hr> <footer> - <p>Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> + <p> + Copyright © 2019 The Apache Software Foundation. + <a href="https://www.apache.org/licenses/" target="external"> + Licensed under the Apache License, Version 2.0 + </a>. + <br/> + Apache Roller, the project logo and the Apache feather logo are trademarks of + <a href="https://www.apache.org/" target="external"> + The Apache Software Foundation. + </a> + </p> </footer> </div> diff --git a/content/getinvolved/edit_website.html b/content/getinvolved/edit_website.html index 6ab38ff..4d6bebd 100644 --- a/content/getinvolved/edit_website.html +++ b/content/getinvolved/edit_website.html @@ -62,10 +62,13 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> - <li><a href="http://www.apache.org/foundation/">Foundation</a></li> - <li><a href="http://projects.apache.org/">Projects</a></li> - <li><a href="http://people.apache.org/">People</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html">Support Apache</a></li> + <li><a href="https://www.apache.org/foundation/" target="external">Foundation</a></li> + <li><a href="https://www.apache.org/events/current-event" target="external">Events</a></li> + <li><a href="https://projects.apache.org/" target="external">Projects</a></li> + <li><a href="https://people.apache.org/" target="external">People</a></li> + <li><a href="https://www.apache.org/foundation/sponsorship.html" target="external">Sponsorship</a></li> + <li><a href="https://www.apache.org/foundation/thanks.html" target="external">Thanks</a></li> + <li><a href="https://www.apache.org/licenses/" target="external">License</a></li> </ul> </li> </ul> @@ -138,8 +141,17 @@ <div class="container"> <hr> <footer> - <p>Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> + <p> + Copyright © 2019 The Apache Software Foundation. + <a href="https://www.apache.org/licenses/" target="external"> + Licensed under the Apache License, Version 2.0 + </a>. + <br/> + Apache Roller, the project logo and the Apache feather logo are trademarks of + <a href="https://www.apache.org/" target="external"> + The Apache Software Foundation. + </a> + </p> </footer> </div> diff --git a/content/index.html b/content/index.html index a17ffac..44a6f73 100644 --- a/content/index.html +++ b/content/index.html @@ -62,10 +62,13 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> - <li><a href="http://www.apache.org/foundation/">Foundation</a></li> - <li><a href="http://projects.apache.org/">Projects</a></li> - <li><a href="http://people.apache.org/">People</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html">Support Apache</a></li> + <li><a href="https://www.apache.org/foundation/" target="external">Foundation</a></li> + <li><a href="https://www.apache.org/events/current-event" target="external">Events</a></li> + <li><a href="https://projects.apache.org/" target="external">Projects</a></li> + <li><a href="https://people.apache.org/" target="external">People</a></li> + <li><a href="https://www.apache.org/foundation/sponsorship.html" target="external">Sponsorship</a></li> + <li><a href="https://www.apache.org/foundation/thanks.html" target="external">Thanks</a></li> + <li><a href="https://www.apache.org/licenses/" target="external">License</a></li> </ul> </li> </ul> @@ -122,8 +125,17 @@ <div class="container"> <hr> <footer> - <p>Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> + <p> + Copyright © 2019 The Apache Software Foundation. + <a href="https://www.apache.org/licenses/" target="external"> + Licensed under the Apache License, Version 2.0 + </a>. + <br/> + Apache Roller, the project logo and the Apache feather logo are trademarks of + <a href="https://www.apache.org/" target="external"> + The Apache Software Foundation. + </a> + </p> </footer> </div> diff --git a/content/project/whoweare.html b/content/project/whoweare.html index 4c12e36..691aae5 100644 --- a/content/project/whoweare.html +++ b/content/project/whoweare.html @@ -62,10 +62,13 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> - <li><a href="http://www.apache.org/foundation/">Foundation</a></li> - <li><a href="http://projects.apache.org/">Projects</a></li> - <li><a href="http://people.apache.org/">People</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html">Support Apache</a></li> + <li><a href="https://www.apache.org/foundation/" target="external">Foundation</a></li> + <li><a href="https://www.apache.org/events/current-event" target="external">Events</a></li> + <li><a href="https://projects.apache.org/" target="external">Projects</a></li> + <li><a href="https://people.apache.org/" target="external">People</a></li> + <li><a href="https://www.apache.org/foundation/sponsorship.html" target="external">Sponsorship</a></li> + <li><a href="https://www.apache.org/foundation/thanks.html" target="external">Thanks</a></li> + <li><a href="https://www.apache.org/licenses/" target="external">License</a></li> </ul> </li> </ul> @@ -115,8 +118,17 @@ <div class="container"> <hr> <footer> - <p>Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> + <p> + Copyright © 2019 The Apache Software Foundation. + <a href="https://www.apache.org/licenses/" target="external"> + Licensed under the Apache License, Version 2.0 + </a>. + <br/> + Apache Roller, the project logo and the Apache feather logo are trademarks of + <a href="https://www.apache.org/" target="external"> + The Apache Software Foundation. + </a> + </p> </footer> </div> diff --git a/sources/src/main/jbake/templates/footer.ftl b/sources/src/main/jbake/templates/footer.ftl index a1721dc..738924b 100644 --- a/sources/src/main/jbake/templates/footer.ftl +++ b/sources/src/main/jbake/templates/footer.ftl @@ -3,8 +3,17 @@ <div class="container"> <hr> <footer> - <p>Copyright © 2018 The Apache Software Foundation, Licensed under the - <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> + <p> + Copyright © 2019 The Apache Software Foundation. + <a href="https://www.apache.org/licenses/" target="external"> + Licensed under the Apache License, Version 2.0 + </a>. + <br/> + Apache Roller, the project logo and the Apache feather logo are trademarks of + <a href="https://www.apache.org/" target="external"> + The Apache Software Foundation. + </a> + </p> </footer> </div> diff --git a/sources/src/main/jbake/templates/header.ftl b/sources/src/main/jbake/templates/header.ftl index 8c89c90..83f6dba 100644 --- a/sources/src/main/jbake/templates/header.ftl +++ b/sources/src/main/jbake/templates/header.ftl @@ -62,10 +62,13 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> - <li><a href="http://www.apache.org/foundation/">Foundation</a></li> - <li><a href="http://projects.apache.org/">Projects</a></li> - <li><a href="http://people.apache.org/">People</a></li> - <li><a href="http://www.apache.org/foundation/sponsorship.html">Support Apache</a></li> + <li><a href="https://www.apache.org/foundation/" target="external">Foundation</a></li> + <li><a href="https://www.apache.org/events/current-event" target="external">Events</a></li> + <li><a href="https://projects.apache.org/" target="external">Projects</a></li> + <li><a href="https://people.apache.org/" target="external">People</a></li> + <li><a href="https://www.apache.org/foundation/sponsorship.html" target="external">Sponsorship</a></li> + <li><a href="https://www.apache.org/foundation/thanks.html" target="external">Thanks</a></li> + <li><a href="https://www.apache.org/licenses/" target="external">License</a></li> </ul> </li> </ul>