Modified: struts/site/trunk/content/volunteers.html URL: http://svn.apache.org/viewvc/struts/site/trunk/content/volunteers.html?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/content/volunteers.html (original) +++ struts/site/trunk/content/volunteers.html Sat Oct 18 15:48:54 2014 @@ -1,106 +1,104 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <meta name="Date-Revision-yyyymmdd" content="20140206"/> + <meta name="Date-Revision-yyyymmdd" content="20140918"/> <meta http-equiv="Content-Language" content="en"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Volunteers</title> - <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="/css/main.css"> + <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css"> + <link rel="stylesheet" href="css/main.css"> - <script type="text/javascript" src="/js/jquery-1.11.0.min.js"></script> - <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script> - <script type="text/javascript" src="/js/community.js"></script> + <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <script type="text/javascript" src="js/community.js"></script> </head> <body> -<a href="http://github.com/apache/struts"> - <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> +<a href="http://github.com/apache/struts" class="github-ribbon"> + <img style="position: absolute; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> </a> <header> - <!-- Fixed navbar --> -<nav> - <div class="navbar navbar-default navbar-fixed-top" role="navigation"> - <div class="container"> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Struts <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="index.html">Welcome</a></li> - <li><a href="downloads.html">Downloads</a></li> - <li><a href="announce.html">Announcements</a></li> - <li><a href="http://www.apache.org/licenses/">License</a></li> - <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li> - <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Support <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="mail.html">User Mailing List</a></li> - <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li> - <li><a href="security.html">Reporting Security Issues</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="birdseye.html">Birds Eye</a></li> - <li><a href="primer.html">Key Technologies</a></li> - <li><a href="kickstart.html">Kickstart FAQ</a></li> - <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li> - <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li> - <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Contributing <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="youatstruts.html">You at Struts</a></li> - <li><a href="helping.html">How to Help FAQ</a></li> - <li><a href="dev-mail.html">Development Lists</a></li> - <li class="divider"></li> - <li><a href="submitting-patches.html">Submitting patches</a></li> - <li><a href="builds.html">Source Code</a></li> - <li><a href="coding-standards.html">Coding standards</a></li> - <li class="divider"></li> - <li><a href="releases.html">Release Guidelines</a></li> - <li><a href="bylaws.html">PMC Charter</a></li> - <li><a href="volunteers.html">Volunteers</a></li> - <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li> - </ul> - </li> - - </ul> + <nav> + <div role="navigation" class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <button type="button" data-toggle="collapse" data-target="#struts-menu" class="navbar-toggle"> + Menu + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="index.html" class="navbar-brand logo"><img src="img/struts-logo.svg"></a> + </div> + <div id="struts-menu" class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Home<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="index.html">Welcome</a></li> + <li><a href="downloads.html">Downloads</a></li> + <li><a href="announce.html">Announcements</a></li> + <li><a href="http://www.apache.org/licenses/">License</a></li> + <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li> + <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Support<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="mail.html">User Mailing List</a></li> + <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li> + <li><a href="security.html">Reporting Security Issues</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Documentation<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="birdseye.html">Birds Eye</a></li> + <li><a href="primer.html">Key Technologies</a></li> + <li><a href="kickstart.html">Kickstart FAQ</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li> + <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li> + <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Contributing<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="youatstruts.html">You at Struts</a></li> + <li><a href="helping.html">How to Help FAQ</a></li> + <li><a href="dev-mail.html">Development Lists</a></li> + <li class="divider"></li> + <li><a href="submitting-patches.html">Submitting patches</a></li> + <li><a href="builds.html">Source Code</a></li> + <li><a href="coding-standards.html">Coding standards</a></li> + <li class="divider"></li> + <li><a href="releases.html">Release Guidelines</a></li> + <li><a href="bylaws.html">PMC Charter</a></li> + <li><a href="volunteers.html">Volunteers</a></li> + <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li> + </ul> + </li> + <li class="apache"><a href="http://www.apache.org/"><img src="img/apache.png"></a></li> + </ul> + </div> </div> - <!--/.nav-collapse --> </div> - </div> -</nav> - - <div class="container"> - <div class="row"> - <div class="pull-left"> - <a href="/" id="bannerLeft"> - <img src="/img/struts.gif" alt="Apache Struts"/> - </a> - </div> - <div class="pull-right"><a href="http://www.apache.org" id="bannerRight"> - <img src="/img/asf-logo.gif" alt="Apache Software Foundation"/> - </a> - </div> - </div> - </div> + </nav> </header> @@ -199,17 +197,41 @@ or committee member.</p> </section> </article> - <hr/> + <footer class="container"> - <div class="row col-md-12 text-center"> - Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved. + <div class="col-md-12"> + Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation </a>. + All Rights Reserved. </div> - <div class="row col-md-12 text-center"> - Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. + <div class="col-md-12"> + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project logos are + trademarks of The Apache Software Foundation. </div> + <div class="col-md-12">Logo and website design donated by <a href="https://softwaremill.com/">SoftwareMill</a>.</div> </footer> +<script>!function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (!d.getElementById(id)) { + js = d.createElement(s); + js.id = id; + js.src = "//platform.twitter.com/widgets.js"; + fjs.parentNode.insertBefore(js, fjs); + } +}(document, "script", "twitter-wjs");</script> +<script src="https://apis.google.com/js/platform.js" async="async" defer="defer"></script> + +<div id="fb-root"></div> + +<script>(function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) return; + js = d.createElement(s); + js.id = id; + js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1"; + fjs.parentNode.insertBefore(js, fjs); +}(document, 'script', 'facebook-jssdk'));</script> + </body> </html>
Modified: struts/site/trunk/content/youatstruts.html URL: http://svn.apache.org/viewvc/struts/site/trunk/content/youatstruts.html?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/content/youatstruts.html (original) +++ struts/site/trunk/content/youatstruts.html Sat Oct 18 15:48:54 2014 @@ -1,106 +1,104 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <meta name="Date-Revision-yyyymmdd" content="20140206"/> + <meta name="Date-Revision-yyyymmdd" content="20140918"/> <meta http-equiv="Content-Language" content="en"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>You at Struts</title> - <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="/css/main.css"> + <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css"> + <link rel="stylesheet" href="css/main.css"> - <script type="text/javascript" src="/js/jquery-1.11.0.min.js"></script> - <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script> - <script type="text/javascript" src="/js/community.js"></script> + <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <script type="text/javascript" src="js/community.js"></script> </head> <body> -<a href="http://github.com/apache/struts"> - <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> +<a href="http://github.com/apache/struts" class="github-ribbon"> + <img style="position: absolute; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> </a> <header> - <!-- Fixed navbar --> -<nav> - <div class="navbar navbar-default navbar-fixed-top" role="navigation"> - <div class="container"> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Struts <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="index.html">Welcome</a></li> - <li><a href="downloads.html">Downloads</a></li> - <li><a href="announce.html">Announcements</a></li> - <li><a href="http://www.apache.org/licenses/">License</a></li> - <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li> - <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Support <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="mail.html">User Mailing List</a></li> - <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li> - <li><a href="security.html">Reporting Security Issues</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="birdseye.html">Birds Eye</a></li> - <li><a href="primer.html">Key Technologies</a></li> - <li><a href="kickstart.html">Kickstart FAQ</a></li> - <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li> - <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li> - <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li> - </ul> - </li> - - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Contributing <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="youatstruts.html">You at Struts</a></li> - <li><a href="helping.html">How to Help FAQ</a></li> - <li><a href="dev-mail.html">Development Lists</a></li> - <li class="divider"></li> - <li><a href="submitting-patches.html">Submitting patches</a></li> - <li><a href="builds.html">Source Code</a></li> - <li><a href="coding-standards.html">Coding standards</a></li> - <li class="divider"></li> - <li><a href="releases.html">Release Guidelines</a></li> - <li><a href="bylaws.html">PMC Charter</a></li> - <li><a href="volunteers.html">Volunteers</a></li> - <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li> - </ul> - </li> - - </ul> + <nav> + <div role="navigation" class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <button type="button" data-toggle="collapse" data-target="#struts-menu" class="navbar-toggle"> + Menu + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="index.html" class="navbar-brand logo"><img src="img/struts-logo.svg"></a> + </div> + <div id="struts-menu" class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Home<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="index.html">Welcome</a></li> + <li><a href="downloads.html">Downloads</a></li> + <li><a href="announce.html">Announcements</a></li> + <li><a href="http://www.apache.org/licenses/">License</a></li> + <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li> + <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Support<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="mail.html">User Mailing List</a></li> + <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li> + <li><a href="security.html">Reporting Security Issues</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Documentation<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="birdseye.html">Birds Eye</a></li> + <li><a href="primer.html">Key Technologies</a></li> + <li><a href="kickstart.html">Kickstart FAQ</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li> + <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li> + <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Contributing<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="youatstruts.html">You at Struts</a></li> + <li><a href="helping.html">How to Help FAQ</a></li> + <li><a href="dev-mail.html">Development Lists</a></li> + <li class="divider"></li> + <li><a href="submitting-patches.html">Submitting patches</a></li> + <li><a href="builds.html">Source Code</a></li> + <li><a href="coding-standards.html">Coding standards</a></li> + <li class="divider"></li> + <li><a href="releases.html">Release Guidelines</a></li> + <li><a href="bylaws.html">PMC Charter</a></li> + <li><a href="volunteers.html">Volunteers</a></li> + <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li> + </ul> + </li> + <li class="apache"><a href="http://www.apache.org/"><img src="img/apache.png"></a></li> + </ul> + </div> </div> - <!--/.nav-collapse --> </div> - </div> -</nav> - - <div class="container"> - <div class="row"> - <div class="pull-left"> - <a href="/" id="bannerLeft"> - <img src="/img/struts.gif" alt="Apache Struts"/> - </a> - </div> - <div class="pull-right"><a href="http://www.apache.org" id="bannerRight"> - <img src="/img/asf-logo.gif" alt="Apache Software Foundation"/> - </a> - </div> - </div> - </div> + </nav> </header> @@ -166,17 +164,41 @@ more information how you can help us.</p </section> </article> - <hr/> + <footer class="container"> - <div class="row col-md-12 text-center"> - Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved. + <div class="col-md-12"> + Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation </a>. + All Rights Reserved. </div> - <div class="row col-md-12 text-center"> - Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. + <div class="col-md-12"> + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project logos are + trademarks of The Apache Software Foundation. </div> + <div class="col-md-12">Logo and website design donated by <a href="https://softwaremill.com/">SoftwareMill</a>.</div> </footer> +<script>!function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (!d.getElementById(id)) { + js = d.createElement(s); + js.id = id; + js.src = "//platform.twitter.com/widgets.js"; + fjs.parentNode.insertBefore(js, fjs); + } +}(document, "script", "twitter-wjs");</script> +<script src="https://apis.google.com/js/platform.js" async="async" defer="defer"></script> + +<div id="fb-root"></div> + +<script>(function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) return; + js = d.createElement(s); + js.id = id; + js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1"; + fjs.parentNode.insertBefore(js, fjs); +}(document, 'script', 'facebook-jssdk'));</script> + </body> </html> Modified: struts/site/trunk/source/_includes/footer.html URL: http://svn.apache.org/viewvc/struts/site/trunk/source/_includes/footer.html?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/source/_includes/footer.html (original) +++ struts/site/trunk/source/_includes/footer.html Sat Oct 18 15:48:54 2014 @@ -1,10 +1,34 @@ -<hr/> + <footer class="container"> - <div class="row col-md-12 text-center"> - Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved. + <div class="col-md-12"> + Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation </a>. + All Rights Reserved. </div> - <div class="row col-md-12 text-center"> - Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. + <div class="col-md-12"> + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project logos are + trademarks of The Apache Software Foundation. </div> + <div class="col-md-12">Logo and website design donated by <a href="https://softwaremill.com/">SoftwareMill</a>.</div> </footer> + +<script>!function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (!d.getElementById(id)) { + js = d.createElement(s); + js.id = id; + js.src = "//platform.twitter.com/widgets.js"; + fjs.parentNode.insertBefore(js, fjs); + } +}(document, "script", "twitter-wjs");</script> +<script src="https://apis.google.com/js/platform.js" async="async" defer="defer"></script> + +<div id="fb-root"></div> + +<script>(function (d, s, id) { + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) return; + js = d.createElement(s); + js.id = id; + js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1"; + fjs.parentNode.insertBefore(js, fjs); +}(document, 'script', 'facebook-jssdk'));</script> Modified: struts/site/trunk/source/_includes/header.html URL: http://svn.apache.org/viewvc/struts/site/trunk/source/_includes/header.html?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/source/_includes/header.html (original) +++ struts/site/trunk/source/_includes/header.html Sat Oct 18 15:48:54 2014 @@ -1,21 +1,82 @@ -<a href="http://github.com/apache/struts"> - <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> +<a href="http://github.com/apache/struts" class="github-ribbon"> + <img style="position: absolute; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"> </a> <header> - {% include top-menu.html %} - - <div class="container"> - <div class="row"> - <div class="pull-left"> - <a href="/" id="bannerLeft"> - <img src="{{ site.root }}/img/struts.gif" alt="Apache Struts"/> - </a> - </div> - <div class="pull-right"><a href="http://www.apache.org" id="bannerRight"> - <img src="{{ site.root }}/img/asf-logo.gif" alt="Apache Software Foundation"/> - </a> + <nav> + <div role="navigation" class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <button type="button" data-toggle="collapse" data-target="#struts-menu" class="navbar-toggle"> + Menu + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="index.html" class="navbar-brand logo"><img src="img/struts-logo.svg"></a> + </div> + <div id="struts-menu" class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Home<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="index.html">Welcome</a></li> + <li><a href="downloads.html">Downloads</a></li> + <li><a href="announce.html">Announcements</a></li> + <li><a href="http://www.apache.org/licenses/">License</a></li> + <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li> + <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Support<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="mail.html">User Mailing List</a></li> + <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li> + <li><a href="security.html">Reporting Security Issues</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Documentation<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="birdseye.html">Birds Eye</a></li> + <li><a href="primer.html">Key Technologies</a></li> + <li><a href="kickstart.html">Kickstart FAQ</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li> + <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li> + <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li> + </ul> + </li> + <li class="dropdown"> + <a data-toggle="dropdown" href="#" class="dropdown-toggle"> + Contributing<b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="youatstruts.html">You at Struts</a></li> + <li><a href="helping.html">How to Help FAQ</a></li> + <li><a href="dev-mail.html">Development Lists</a></li> + <li class="divider"></li> + <li><a href="submitting-patches.html">Submitting patches</a></li> + <li><a href="builds.html">Source Code</a></li> + <li><a href="coding-standards.html">Coding standards</a></li> + <li class="divider"></li> + <li><a href="releases.html">Release Guidelines</a></li> + <li><a href="bylaws.html">PMC Charter</a></li> + <li><a href="volunteers.html">Volunteers</a></li> + <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li> + </ul> + </li> + <li class="apache"><a href="http://www.apache.org/"><img src="img/apache.png"></a></li> + </ul> + </div> </div> </div> - </div> + </nav> </header> Modified: struts/site/trunk/source/_layouts/default.html URL: http://svn.apache.org/viewvc/struts/site/trunk/source/_layouts/default.html?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/source/_layouts/default.html (original) +++ struts/site/trunk/source/_layouts/default.html Sat Oct 18 15:48:54 2014 @@ -1,20 +1,20 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <meta name="Date-Revision-yyyymmdd" content="20140206"/> + <meta name="Date-Revision-yyyymmdd" content="20140918"/> <meta http-equiv="Content-Language" content="en"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>{{ page.title }}</title> - <link rel="stylesheet" href="{{ site.root }}/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="{{ site.root }}/css/main.css"> + <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css"> + <link rel="stylesheet" href="css/main.css"> - <script type="text/javascript" src="{{ site.root }}/js/jquery-1.11.0.min.js"></script> - <script type="text/javascript" src="{{ site.root }}/bootstrap/js/bootstrap.js"></script> - <script type="text/javascript" src="{{ site.root }}/js/community.js"></script> + <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <script type="text/javascript" src="js/community.js"></script> </head> <body> @@ -26,7 +26,7 @@ </section> </article> - {% include footer.html %} +{% include footer.html %} </body> </html> Copied: struts/site/trunk/source/_layouts/main-page-old.html (from r1601081, struts/site/trunk/source/_layouts/main-page.html) URL: http://svn.apache.org/viewvc/struts/site/trunk/source/_layouts/main-page-old.html?p2=struts/site/trunk/source/_layouts/main-page-old.html&p1=struts/site/trunk/source/_layouts/main-page.html&r1=1601081&r2=1632808&rev=1632808&view=diff ============================================================================== --- struts/site/trunk/source/_layouts/main-page.html (original) +++ struts/site/trunk/source/_layouts/main-page-old.html Sat Oct 18 15:48:54 2014 @@ -9,12 +9,12 @@ <title>{{ page.title }}</title> - <link rel="stylesheet" href="{{ site.root }}/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="{{ site.root }}/css/main.css"> + <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="css/main.css"> - <script type="text/javascript" src="{{ site.root }}/js/jquery-1.11.0.min.js"></script> - <script type="text/javascript" src="{{ site.root }}/bootstrap/js/bootstrap.js"></script> - <script type="text/javascript" src="{{ site.root }}/js/community.js"></script> + <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <script type="text/javascript" src="js/community.js"></script> </head> <body> Copied: struts/site/trunk/source/_layouts/main-page.html (from r1601081, struts/site/trunk/source/_layouts/main-page.html) URL: http://svn.apache.org/viewvc/struts/site/trunk/source/_layouts/main-page.html?p2=struts/site/trunk/source/_layouts/main-page.html&p1=struts/site/trunk/source/_layouts/main-page.html&r1=1601081&r2=1632808&rev=1632808&view=diff ============================================================================== --- struts/site/trunk/source/_layouts/main-page.html (original) +++ struts/site/trunk/source/_layouts/main-page.html Sat Oct 18 15:48:54 2014 @@ -1,32 +1,32 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <meta name="Date-Revision-yyyymmdd" content="20140206"/> + <meta name="Date-Revision-yyyymmdd" content="20140918"/> <meta http-equiv="Content-Language" content="en"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>{{ page.title }}</title> - <link rel="stylesheet" href="{{ site.root }}/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="{{ site.root }}/css/main.css"> + <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css"> + <link rel="stylesheet" href="css/main.css"> - <script type="text/javascript" src="{{ site.root }}/js/jquery-1.11.0.min.js"></script> - <script type="text/javascript" src="{{ site.root }}/bootstrap/js/bootstrap.js"></script> - <script type="text/javascript" src="{{ site.root }}/js/community.js"></script> + <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <script type="text/javascript" src="js/community.js"></script> </head> <body> - {% include header.html %} +{% include header.html %} - <article> - <section> - {{ content }} - </section> - </article> +<article class="container index"> + <section> + {{ content }} + </section> +</article> - {% include footer.html %} +{% include footer.html %} </body> </html> Modified: struts/site/trunk/source/birdseye.md URL: http://svn.apache.org/viewvc/struts/site/trunk/source/birdseye.md?rev=1632808&r1=1632807&r2=1632808&view=diff ============================================================================== --- struts/site/trunk/source/birdseye.md (original) +++ struts/site/trunk/source/birdseye.md Sat Oct 18 15:48:54 2014 @@ -48,10 +48,10 @@ Struts provides the glue that joins the into a coherent whole. Our goal is to leverage existing standards by producing the missing pieces we need to create enterprise-grade applications that are easy to maintain over time. -Long time the Apache Struts Project offered two major versions of the Struts framework. -Meanwhile we maintaining only Struts 2. It is recommended to upgrade all Struts 1.x -application to Struts 2. Please do not start any more applications on top of Struts 1.x, -as you will not receive security patches any more. +The Apache Struts Project offered two major versions of the Struts framework. Currently we are +only maintaining the Struts 2 version. It is recommended to upgrade all Struts 1.x application +to Struts 2. Please do not start new application development using Struts 1.x, as we are no longer +issuing security patches. Struts 2 was originally known as WebWork 2. After working independently for several years, the WebWork and Struts communities joined forces to create Struts 2. The 2.x framework