Repository: shiro-site Updated Branches: refs/heads/master 99052f52e -> 38f7c6cee
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/default.vtl ---------------------------------------------------------------------- diff --git a/templates/default.vtl b/templates/default.vtl index 645d18a..ed1dbc8 100644 --- a/templates/default.vtl +++ b/templates/default.vtl @@ -17,6 +17,7 @@ <html> #parse("templates/includes.vtl") <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"> @@ -43,29 +44,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="$root/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="$root/assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="$root/assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="$root/assets/css/style.css"> + <script type="text/javascript" src="$root/assets/js/shiro-site.js"></script> + <!-- github ribbon --> <link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.css" /> <!--[if lt IE 9]> <link rel="stylesheet" href="$root/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="$root/assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="$root/assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="$root/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="$root/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="$root/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(); @@ -74,52 +90,118 @@ </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="$root/index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="$root/index.html"> + <img src="$root/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="$root/get-started.html">Get Started</a></li> <li><a href="$root/documentation.html">Docs</a></li> <li><a href="$root/web-features.html">Web Apps</a></li> - <li><a href="$root/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="$root/spring.html">Spring</a></li> + <li><a href="$root/guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="$root/integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="$root/features.html">Features</a></li> - <li><a href="$root/community.html">Community</a></li> - </ul> - </div> - <div id="content"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="$root/forums.html">Community Forums</a></li> + <li><a href="$root/mailing-lists.html">Mailing Lists</a></li> + <li><a href="$root/articles.html">Articles</a></li> + <li><a href="$root/news.html">News</a></li> + <li><a href="$root/events.html">Events</a></li> + <li class="divider"></li> + <li><a href="$root/community.html">More</a></li> + </ul> + </li> - #if ($layout) - #parse($layout) - #else - $content - #end + </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><!--END WRAPPER--> - <div id="footer"> + #if ($layout) + #parse($layout) + #else + $content + #end + +</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 © 2008-$year 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> http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/macros/danger.vtl ---------------------------------------------------------------------- diff --git a/templates/macros/danger.vtl b/templates/macros/danger.vtl index b02e19d..5513718 100644 --- a/templates/macros/danger.vtl +++ b/templates/macros/danger.vtl @@ -1,23 +1,7 @@ #macro(danger $title, $message) -<div class="panelMacro"> - <table class="warningMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-exclamation-circle"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>${title}</b> - <br clear="none"> - ${message} - </td> - </tr> - </tbody> - </table> +<div class="alert alert-danger"> + <span class="glyphicon glyphicon-exclamation-sign"></span> <strong>${title}</strong> + <hr class="message-inner-separator"> + <p>${message}</p> </div> #end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/macros/info.vtl ---------------------------------------------------------------------- diff --git a/templates/macros/info.vtl b/templates/macros/info.vtl index 459068b..e90a60b 100644 --- a/templates/macros/info.vtl +++ b/templates/macros/info.vtl @@ -1,25 +1,7 @@ #macro(info $title, $message) -<div class="panelMacro"> - <table class="infoMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - - - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-info-circle"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>${title}</b> - <br clear="none"> - ${message} - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>${title}</strong> + <hr class="message-inner-separator"> + <p>${message}</p> </div> #end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/macros/tip.vtl ---------------------------------------------------------------------- diff --git a/templates/macros/tip.vtl b/templates/macros/tip.vtl index 717c5b0..6f6099b 100644 --- a/templates/macros/tip.vtl +++ b/templates/macros/tip.vtl @@ -1,21 +1,7 @@ #macro(tip $title, $message) -<div class="panelMacro"> - <table class="tipMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody><tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-check-square-o"></i> - </td> - <td colspan="1" rowspan="1"> - <b>${title}</b> - <br clear="none"> - ${message} - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>${title}</strong> + <hr class="message-inner-separator"> + <p>${message}</p> </div> #end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/macros/warning.vtl ---------------------------------------------------------------------- diff --git a/templates/macros/warning.vtl b/templates/macros/warning.vtl index fedd599..f0dbb12 100644 --- a/templates/macros/warning.vtl +++ b/templates/macros/warning.vtl @@ -1,23 +1,7 @@ #macro(warning $title, $message) -<div class="panelMacro"> - <table class="noteMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-warning"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>${title}</b> - <br clear="none"> - ${message} - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>${title}</strong> + <hr class="message-inner-separator"> + <p>${message}</p> </div> #end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/templates/versions.vtl ---------------------------------------------------------------------- diff --git a/templates/versions.vtl b/templates/versions.vtl index 3663a0d..fc5a033 100644 --- a/templates/versions.vtl +++ b/templates/versions.vtl @@ -13,11 +13,8 @@ "description": 'Enables <a class="external-link" href="http://www.eclipse.org/aspectj/";>AspectJ</a> support for Shiro AOP and Annotations.'}) #set ($shiroCas = {"g": "org.apache.shiro", "a": "shiro-cas", "type": "jar", - "description": 'Enables Jasig <a class="external-link" href="https://wiki.jasig.org/display/CAS/Home";>CAS</a> support. - <div class="warning"> - <span>NOTE:</span> - Shiro-CAS support is deprecated, support has been moved to the Apache Shiro based <a href="https://github.com/bujiio/buji-pac4j";>buji-pac4j</a> project. - </div>'}) + "description": "Enables Jasig <a class='external-link' href='https://wiki.jasig.org/display/CAS/Home'>CAS</a> support. + #warning('NOTE:', 'Shiro-CAS support is deprecated, support has been moved to the Apache Shiro based <a href=''https://github.com/bujiio/buji-pac4j''>buji-pac4j</a> project.')"}) #set ($shiroEhCache = {"g": "org.apache.shiro", "a": "shiro-ehcache", "type": "jar", "description": 'Enables <a class="external-link" href="http://www.ehcache.org";>Ehcache</a>-based famework caching.'}) @@ -25,7 +22,7 @@ #set ($shiroHazelcast = {"g": "org.apache.shiro", "a": "shiro-hazelcast", "type": "jar", "description": 'Enables <a class="external-link" href="https://hazelcast.org";>Hazelcast</a>-based famework caching.'}) -#set ($shiroFeatures = {"g": "org.apache.shiro", "a": "shiro-features", "type": "xml", +#set ($shiroFeatures = {"g": "org.apache.shiro", "a": "shiro-features", "c": "features", "type": "xml", "description": 'OSGi / <a class="external-link" href="http://karaf.apache.org/";>Apache Karaf</a> integration.'}) #set ($shiroGuice = {"g": "org.apache.shiro", "a": "shiro-guice", "type": "jar", http://git-wip-us.apache.org/repos/asf/shiro-site/blob/38f7c6ce/web.md.vtl ---------------------------------------------------------------------- diff --git a/web.md.vtl b/web.md.vtl index 8c4be46..1fd4acd 100644 --- a/web.md.vtl +++ b/web.md.vtl @@ -320,8 +320,7 @@ Note that all path expressions are relative to your application's context root. #warning('Order Matters!', 'URL path expressions are evaluated against an incoming request in the order they are defined and the <em>FIRST MATCH WINS</em>. For example, let''s asume that there are the following chain definitions: -<pre><code class="ini"> -/account/** = ssl, authc +<pre><code class="ini">/account/** = ssl, authc /account/signup = anon </code></pre> <p>If an incoming request is intended to reach <code>/account/signup/index.html</code> (accessible by all ''anon''ymous users), <em>it will never be handled!</em>. The reason is that the <code>/account/**</code> pattern matched the incoming request first and ''short-circuited'' all remaining definitions.</p>
