Modified: shiro/site/publish/guides.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/guides.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/guides.html (original)
+++ shiro/site/publish/guides.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a name="Guides-ApacheShiroGuides"></a>
+            <a name="Guides-ApacheShiroGuides"></a>
 <h1><a href="#apache-shiro-guides" name="apache-shiro-guides">Apache Shiro 
Guides</a></h1>
 <p>Here are some basic guides on how to use Shiro.</p>
 <p>Please post any errata to the user or dev mailing lists.</p>
@@ -113,27 +199,23 @@
   <li>
   <p><strong><a href="java-authorization-guide.html" title="Java Authorization 
Guide">Authorization Guide</a></strong><br/><input type="hidden" 
id="ghEditPage" value="guides.md"></input></p></li>
 </ul>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/how-to-contribute.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/how-to-contribute.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/how-to-contribute.html (original)
+++ shiro/site/publish/how-to-contribute.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a 
name="HowtoContribute-ContributingtoApacheShiro"></a>
+            <a name="HowtoContribute-ContributingtoApacheShiro"></a>
 <h1><a href="#contributing-to-apache-shiro" 
name="contributing-to-apache-shiro">Contributing to Apache Shiro</a></h1>
 <ul>
   <li><a href="#HowtoContribute-introduction">Introduction</a></li>
@@ -224,27 +310,23 @@ master
   <li>Keep all project-related discussion on the mailing list. It is much 
better to utilise the wider audience, rather than to break off into private 
discussion groups. You never know who else will have the answer to your issues, 
and anyway other people are interested in the outcome.</li>
   <li>Become familiar with the mailing lists. As you browse and search, you 
will see the way other people do things. Follow the leading 
examples.<br/><input type="hidden" id="ghEditPage" 
value="how-to-contribute.md"></input></li>
 </ul>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/inclusionslibrary.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/inclusionslibrary.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/inclusionslibrary.html (original)
+++ shiro/site/publish/inclusionslibrary.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <p>The children of this page contain information 
which is <strong>included in other pages</strong>. This is a library of 
re-usable information chunks.</p>
+            <p>The children of this page contain information which is 
<strong>included in other pages</strong>. This is a library of re-usable 
information chunks.</p>
 <p>If you want to change any of these pages, be aware that:</p>
 <ul>
   <li>Changing page names is problematic — you will need to change all the 
{include} and {excerpt-include} macros manually.</li>
@@ -115,27 +201,23 @@
 <pre><code>{include:page name|nopanel=true} 
 </code></pre>
 <input type="hidden" id="ghEditPage" value="inclusionslibrary.md"></input>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/index.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/index.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/index.html (original)
+++ shiro/site/publish/index.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,158 +97,277 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
-                <li><a href="./get-started.html">Get Started</a></li>
-                <li><a href="./documentation.html">Docs</a></li>
-                <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
-                <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
-            </ul>
-        </div>
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
-        <div id="content">
 
-                            <div id="main-content">
 
-    <h1>Welcome to Apache Shiro</h1>
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
 
-    <p>Apache Shiro is a powerful and easy-to-use Java security framework that 
performs authentication,
-        authorization, cryptography, and session management. With 
Shiro&#8217;s easy-to-understand API, you can
-        quickly and easily secure any application &#8211; from the smallest 
mobile applications to the largest web
-        and enterprise applications.</p>
 
-    <a href="authentication-features.html">
-        <div class="service-tabs authentication">
-            <h2>Authentication</h2>
 
-            <p>Support logins across one or more pluggable data soucres (LDAP, 
JDBC, Active Directory...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
         </div>
-    </a>
 
-    <a href="authorization-features.html">
-        <div class="service-tabs authorization">
-            <h2>Authorization</h2>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
 
-            <p>Perform access control based on roles or fine grained 
permissions, also using plug...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
-        </div>
-    </a>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
 
-    <a href="cryptography-features.html">
-        <div class="service-tabs cryptography">
-            <h2>Cryptography</h2>
+                <li><a href="./features.html">Features</a></li>
 
-            <p>Secure data with the easiest possible Cryptography API&#8217;s 
available, giving you...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
-        </div>
-    </a>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
 
-    <a href="session-management-features.html">
-        <div class="service-tabs session-management">
-            <h2>Session Management</h2>
+            </ul>
 
-            <p>Use sessions in any environment, even outside web or EJB 
containers. Easily...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
+            </ul>
         </div>
-    </a>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-    <a href="web-features.html">
-        <div class="service-tabs web-integration">
-            <h2>Web Integration</h2>
 
-            <p>Save development time with innovative approaches that easily 
handle web specific...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
-        </div>
-    </a>
+            
+<div class="row">
+
+    <div class="col-md-3 col-md-push-9">
+        <!--<div class="news" style="margin-bottom: 20px;">-->
+            <!--<h5>Latest News</h5>-->
+            <!--<ul class="list-unstyled">-->
+                <!--{% for post in site.categories.news limit:4 %}-->
+                <!--<li><a href="{{ post.url }}">{{ post.title }}</a>-->
+                    <!--<span class="small">({{post.date| date:"%b %d, 
%Y"}})</span></li>-->
+                <!--{% endfor %}-->
+            <!--</ul>-->
+            <!--<p class="small" style="text-align: right;"><a 
href="news.html">Archive</a></p>-->
+        <!--</div>-->
+
+        <div class="hidden-xs hidden-sm">
+            <a href="download.html" class="btn btn-success btn-lg btn-block" 
style="margin-bottom: 30px;">
+                Download
+            </a>
+
+            <div class="panel panel-primary">
+                <div class=" panel-heading" style="text-align: center;">
+                    Popular Guides:
+                </div>
+
+                <div class="panel-body">
+                    <div>
+                        <a href="java-authentication-guide.html">Java 
Authentication Guide</a>
+                        <p><small>Learn how Shiro securely verifies 
identities.</small></p>
+                    </div>
+                    <div>
+                        <a href="java-authorization-guide.html">Java 
Authorization Guide</a></h3>
+                        <p>Learn how Shiro handles permissions, roles and 
users.</p>
+                    </div>
+                    <div>
+                        <a href="webapp-tutorial.html">Web App 
Tutorial</a></h3>
+                        <p>Step-by-step tutorial for securing a web 
application with Apache Shiro.</p>
+                    </div>
+                </div>
+            </div>
 
-    <a href="integration.html">
-        <div class="service-tabs integrations">
-            <h2>Integrations</h2>
+            <div class="panel panel-primary">
+                <div class=" panel-heading" style="text-align: center;">
+                    Communities Using Shiro:
+                </div>
+
+                <div class="panel-body communities">
+                    <img src="assets/images/logos.png" class="img-responsive 
center-block">
+                </div>
+            </div>
 
-            <p>API&#8217;s giving you power and simplicty beyond what Java 
provides by default...</p>
-            <span class="more">Read More &gt;&gt;&gt;</span>
         </div>
-    </a>
+    </div>
 
-    <div class="clearfix"></div>
+    <div class="col-md-9 col-md-pull-3">
 
-    <table class="video-box" width="640" cellspacing="0" cellpadding="0">
-        <tr>
-            <td colspan="1" rowspan="1">
-                <iframe frameborder="0" scrolling="auto" width="310" 
height="233"
-                        src="http://www.youtube.com/embed/YJByiDvOhsc?rel=0"; 
allowfullscreen="true"></iframe>
-            </td>
-            <td colspan="1" rowspan="1">
+
+
+
+        <div class="jumbotron">
+            <b>Apache Shiro&trade;</b> is a powerful and easy-to-use Java 
security framework that performs authentication,
+            authorization, cryptography, and session management. With 
Shiro&#8217;s easy-to-understand API, you can
+            quickly and easily secure any application &#8211; from the 
smallest mobile applications to the largest web
+            and enterprise applications.
+        </div>
+
+        <div class="row row-padded">
+            <div class="col-md-6 col-sm-6">
                 <h1>Getting Started</h1>
+
                 <ul>
                     <li><a 
href="https://www.infoq.com/articles/apache-shiro";>What is Apache 
Shiro?</a></li>
                     <li><a href="10-minute-tutorial.html">10 Minute 
Tutorial</a></li>
                     <li><a href="articles.html">More articles...</a></li>
                 </ul>
-            </td>
-        </tr>
-    </table>
+            </div>
 
-</div>
+            <div class="col-md-6 col-sm-6 col-padded-top col-center">
+                <div style="width: 100%; max-width: 272px; display: 
inline-block; text-align: center; margin-left: 50px; padding-bottom: 15px;">
+                    <iframe frameborder="0" scrolling="auto" width="310" 
height="233"
+                            
src="http://www.youtube.com/embed/YJByiDvOhsc?rel=0"; 
allowfullscreen="true"></iframe>
+                </div>
+            </div>
+        </div>
+
+        <div class="row row-padded">
+            <div class="col-md-6 col-sm-6 panel ">
+                <div class="panel-heading authentication">
+                    <h2 class="panel-title"> Authentication </h2>
+                </div>
+                <div class="panel-body">
+                    <p>Support logins across one or more pluggable data 
soucres (LDAP, JDBC, Active Directory...</p>
+                    <a href="authentication-features.html"><span 
class="more">Read More &gt;&gt;&gt;</span></a>
+                </div>
+            </div>
 
-<div id="right-column">
+            <div class="col-md-6 col-sm-6 panel">
+                <div class="panel-heading authorization">
+                    <h2 class="panel-title"> Authorization</h2>
+                </div>
+                <div class="panel-body">
+                    <p>Perform access control based on roles or fine grained 
permissions, also using plug...</p>
+                    <a href="authorization-features.html"><span 
class="more">Read More &gt;&gt;&gt;</span></a>
+                </div>
+            </div>
+        </div>
 
-    <a href="download.html"><div class="download"></div></a>
+        <div class="row row-padded">
+            <div class="col-md-6 col-sm-6 panel">
+                <div class="panel-heading cryptography">
+                    <h2 class="panel-title"> Cryptography</h2>
+                </div>
+                <div class="panel-body">
+                    <p>Secure data with the easiest possible Cryptography 
API&#8217;s available, giving you...</p>
+                    <a href="cryptography-features.html"><span 
class="more">Read More &gt;&gt;&gt;</span></a>
+                </div>
+            </div>
 
-    <h2>Popular Guides</h2>
+            <div class="col-md-6 col-sm-6 panel">
+                <div class="panel-heading session-management">
+                    <h2 class="panel-title"> Session Management</h2>
+                </div>
+                <div class="panel-body">
+                    <p>Use sessions in any environment, even outside web or 
EJB containers. Easily...</p>
+                    <a href="session-management-features.html"><span 
class="more">Read More &gt;&gt;&gt;</span></a>
+                </div>
+            </div>
+        </div>
 
-    <h3><a href="java-authentication-guide.html">Java Authentication 
Guide</a></h3>
-    <p>Learn how Shiro securely verifies identities.</p>
-    <a href="java-authentication-guide.html"><span class="more">Read More 
&gt;&gt;&gt;</span></a>
+        <div class="row row-padded">
+            <div class="col-md-6 col-sm-6 panel">
+                <div class="panel-heading web-integration">
+                    <h2 class="panel-title"> Web Integration</h2>
+                </div>
+                <div class="panel-body">
+                    <p>Save development time with innovative approaches that 
easily handle web specific...</p>
+                    <a href="web-features.html"><span class="more">Read More 
&gt;&gt;&gt;</span></a>
+                </div>
+            </div>
 
-    <h3><a href="java-authorization-guide.html">Java Authorization 
Guide</a></h3>
-    <p>Learn how Shiro handles permissions, roles and users.</p>
-    <a href="java-authorization-guide.html"><span class="more">Read More 
&gt;&gt;&gt;</span></a>
-               
-    <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
-    <p>Step-by-step tutorial for securing a web application with Apache 
Shiro.</p>
-    <a href="webapp-tutorial.html"><span class="more">Read More 
&gt;&gt;&gt;</span></a>
-               
+            <div class="col-md-6 col-sm-6 panel">
+                <div class="panel-heading integrations">
+                    <h2 class="panel-title"> Integrations</h2>
+                </div>
+                <div class="panel-body">
+                    <p>API&#8217;s giving you power and simplicty beyond what 
Java provides by default...</p>
+                    <a href="integration.html"><span class="more">Read More 
&gt;&gt;&gt;</span></a>
+                </div>
+            </div>
+        </div>
 
-    <h2>Communities Using Shiro</h2>
 
-    <div class="communities"><img src="assets/images/logos.png"></div>
 
+    </div>
 </div>
 
-<div class="clearfix"></div>
 
-            
-        </div>
 
-    </div><!--END WRAPPER-->
 
-    <div id="footer">
+
+
+
+
+
+    
+</div>
+
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/integration.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/integration.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/integration.html (original)
+++ shiro/site/publish/integration.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <h1><a href="#apache-shiro-integrations" 
name="apache-shiro-integrations">Apache Shiro Integrations</a></h1>
+            <h1><a href="#apache-shiro-integrations" 
name="apache-shiro-integrations">Apache Shiro Integrations</a></h1>
 <p>Shiro has been downloaded over one million times and is in production at 
thousands of companies. One reason: it integrates well with other technologies 
and frameworks. </p>
 <h2><a href="#officially-supported-integrations" 
name="officially-supported-integrations">Officially Supported 
Integrations</a></h2>
 <p>These integrations are supported by the Apache Shiro Development team. Want 
to help make them great? <a href="how-to-contribute.html">Contribute</a> back 
to the project!</p>
@@ -155,27 +241,23 @@
 </ul>
 <h2><a href="#got-an-integration-" name="got-an-integration-">Got An 
Integration?</a></h2>
 <p>Have an integration you want listed? Send us a pull request of <a 
href="https://github.com/apache/shiro-site/blob/master/integration.md";>this 
page</a>, and participate in Shiro development! <a 
href="how-to-contribute.html">Learn more about contributing to Apache 
Shiro</a>.<br/><input type="hidden" id="ghEditPage" 
value="integration.md"></input></p>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/introduction.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/introduction.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/introduction.html (original)
+++ shiro/site/publish/introduction.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a 
name="Introduction-IntroductiontoApacheShiro"></a>
+            <a name="Introduction-IntroductiontoApacheShiro"></a>
 <h1><a href="#introduction-to-apache-shiro" 
name="introduction-to-apache-shiro">Introduction to Apache Shiro</a></h1>
 <a name="Introduction-WhatisApacheShiro%3F"></a>
 <h2><a href="#what-is-apache-shiro-" name="what-is-apache-shiro-">What is 
Apache Shiro?</a></h2>
@@ -147,27 +233,23 @@
   <li>&ldquo;Run As&rdquo;: A feature that allows users to assume the identity 
of another user (if they are allowed), sometimes useful in administrative 
scenarios.</li>
   <li>&ldquo;Remember Me&rdquo;: Remember users&rsquo; identities across 
sessions so they only need to log in when mandatory.<br/><input type="hidden" 
id="ghEditPage" value="introduction.md"></input></li>
 </ul>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/issues.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/issues.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/issues.html (original)
+++ shiro/site/publish/issues.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a 
name="Issues-ApacheShiroBug%26IssueTracking"></a>
+            <a name="Issues-ApacheShiroBug%26IssueTracking"></a>
 <h2>Apache Shiro Bug &amp; Issue Tracking</h2>
 <p>Apache Shiro uses Atlassian Jira for tracking tasks, feature requests, 
bugs, and other issues related to the project development.</p>
 <a name="Issues-UsageGuidelines"></a>
@@ -118,27 +204,23 @@
 <a 
name="Issues-ClickheretovisittheApacheShiroJiraissuetrackerhttps%3A%2F%2Fissues.apache.org%2Fjira%2Fbrowse%2FSHIRO"></a>
 <h2><a href="https://issues.apache.org/jira/browse/SHIRO";>Click here to visit 
the Apache Shiro Jira issue tracker</a></h2>
 <input type="hidden" id="ghEditPage" value="issues.md"></input>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/java-annotations-list.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-annotations-list.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/java-annotations-list.html (original)
+++ shiro/site/publish/java-annotations-list.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./assets/images/apache-shiro-logo.png" 
style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
+            </a>
+            <span class="tagline">Simple. Java. Security.</span>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a 
name="JavaAnnotationsList-JavaAnnotationsList"></a>
+            <a name="JavaAnnotationsList-JavaAnnotationsList"></a>
 <h1><a href="#java-annotations-list" name="java-annotations-list">Java 
Annotations List</a></h1>
 <p>Below are a list of the different Shiro annotations you can use in your 
application.</p>
 <ul>
@@ -117,27 +203,23 @@
   <p><strong><a 
href="static/current/apidocs/org/apache/shiro/authz/annotation/RequiresUser.html">RequiresUser</a></strong>
 - Requires the current Subject to be an application user for the annotated 
class/instance/method to be accessed or invoked.</p></li>
 </ul>
 <input type="hidden" id="ghEditPage" value="java-annotations-list.md"></input>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>



Reply via email to