You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/07/09 17:17:27 UTC

[15/52] [partial] wicket-site git commit: porting of the new site from https://github.com/dashorst/wicket-site/tree/asf-site

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/helloworld.html b/content/learn/examples/helloworld.html
index f699f6e..02c102c 100644
--- a/content/learn/examples/helloworld.html
+++ b/content/learn/examples/helloworld.html
@@ -1,219 +1,75 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Hello World!</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Hello World! | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/examples/helloworld.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
 </div>
-
-		<div id="contentbody">
-			<h1>Hello World!</h1>
-			<p>HelloWorld demonstrates the basic structure of a web application in Wicket. A
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Hello World!</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#ready-to-deploy"><span class="toc-number">1</span> <span class="toc-text">Ready to deploy</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>HelloWorld demonstrates the basic structure of a web application in Wicket. A
 Label component is used to display a message on the home page for the
 application.</p>
-
 <p>In all the Wicket examples, you have to put all files in the same package
 directory. This means putting the markup files and the java files next to one
 another. It is possible to alter this behavior, but that is beyond the scope
 of this example. The only exception is the obligatory web.xml file which
 should reside in the WEB-INF/ directory of your web application root folder.</p>
-
 <p>If you wish to start building this example, you may want to take a look at the
 Wicket Quickstart project, which provides a quick way of getting up and
 running without having to figure things out yourself. The Quickstart project
 contains the necessary build files (Ant and Maven), libraries, minimal set of
 Java and markup files and an embedded Jetty server to run your application
 without having to go through the whole build-deploy cycle.</p>
-
 <h3 id="helloworldapplicationjava">HelloWorldApplication.java</h3>
-
 <p>Each Wicket application is defined by an Application object. This object
 defines what the home page is, and allows for some configuration.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">import</span> <span class="nn">org.apache.wicket.protocol.http.WebApplication</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloWorldApplication</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">HelloWorldApplication</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
-
     <span class="cm">/**</span>
 <span class="cm">     * @see org.apache.wicket.Application#getHomePage()</span>
 <span class="cm">     */</span>
@@ -222,24 +78,18 @@ defines what the home page is, and allows for some configuration.</p>
         <span class="k">return</span> <span class="n">HelloWorld</span><span class="o">.</span><span class="na">class</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <p>Here you can see that we define <code>wicket.examples.helloworld.HelloWorld</code> to be
 our home page. When the base URL of our application is requested, the markup
 rendered by the HelloWorld page is returned.</p>
-
 <h3 id="helloworldjava">HelloWorld.java</h3>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.WebPage</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.basic.Label</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloWorld</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">HelloWorld</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">Label</span><span class="o">(</span><span class="s">&quot;message&quot;</span><span class="o">,</span> <span class="s">&quot;Hello World!&quot;</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <p>The Label is constructed using two parameters:</p>
-
 <ol>
   <li>
     <p>“message”</p>
@@ -248,23 +98,17 @@ rendered by the HelloWorld page is returned.</p>
     <p>“Hello World!”</p>
   </li>
 </ol>
-
 <p>The first parameter is the component identifier, which Wicket uses to identify
 the <code>Label</code> component in your HTML markup. The second parameter is the message
 which the <code>Label</code> should render.</p>
-
 <h3 id="helloworldhtml">HelloWorld.html</h3>
-
 <p>The HTML file that defines our Hello World functionality is as follows:</p>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;span</span> <span class="na">wicket:id=</span><span class="s">&quot;message&quot;</span><span class="nt">&gt;</span>Message goes here<span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>In this file, you see two elements that need some attention:</p>
-
 <ul>
   <li>
     <p>the component declaration <code>&lt;span wicket:id="message"&gt;</code></p>
@@ -273,23 +117,18 @@ which the <code>Label</code> should render.</p>
     <p>the text <code>Message goes here</code></p>
   </li>
 </ul>
-
 <p>The component declaration consists of the Wicket identifier <code>wicket:id</code> and the
 component identifier <code>message</code>. The component identifier should be the same as
 the name of the component you defined in your <code>WebPage</code>. The text between
 the <code>&lt;span&gt;</code> tags is removed when the component renders its message. The final
 content of the component is determined by your Java code.</p>
-
 <h3 id="webxml">web.xml</h3>
-
 <p>In order to deploy our HelloWorld program, we need to make our application
 known to the application server by means of the web.xml file.</p>
-
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="cp">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
 <span class="cp">&lt;!DOCTYPE web-app</span>
 <span class="cp">      PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN&quot;</span>
 <span class="cp">      &quot;http://java.sun.com/dtd/web-app_2_3.dtd&quot;&gt;</span>
-
 <span class="nt">&lt;web-app&gt;</span>
     <span class="nt">&lt;display-name&gt;</span>Wicket Examples<span class="nt">&lt;/display-name&gt;</span>
     <span class="nt">&lt;filter&gt;</span>
@@ -305,39 +144,36 @@ known to the application server by means of the web.xml file.</p>
         <span class="nt">&lt;url-pattern&gt;</span>/*<span class="nt">&lt;/url-pattern&gt;</span>
     <span class="nt">&lt;/filter-mapping&gt;</span>
 <span class="nt">&lt;/web-app&gt;</span></code></pre></div>
-
 <p>In this definition you see the Wicket filter defined, which handles all
 requests. In order to let Wicket know which application is available, only the
 applicationClassName filter parameter is needed.</p>
-
 <p>Also, notice the url-mapping to /*. The Wicket filter will only process
 requests that are Wicket requests. If a request is not Wicket related, the
 filter will pass the request on to the chain. This ensures that (static)
 resources outside the realm of the Wicket application, such as style sheets,
 JavaScript files, images and so forth will be served by the container.</p>
-
 <h2 id="ready-to-deploy">Ready to deploy</h2>
-
 <p>That’s it. No more configuration necessary! All you need to do now is to
 deploy the web application into your favorite application server. Point your
 browser to the url: <code>http://&lt;servername&gt;/&lt;warfilename&gt;/</code>, substituting
 servername and warfilename to the appropriate values, such as
 http://localhost:8080/helloworld/.</p>
-
 <p>As you can see: no superfluous XML configuration files are needed to enable a
 Wicket application. Only the markup (HTML) files, the Java class files and the
 required web.xml were needed to create this application.</p>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/examples/index.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/index.html b/content/learn/examples/index.html
index f6f17cf..b128232 100644
--- a/content/learn/examples/index.html
+++ b/content/learn/examples/index.html
@@ -1,201 +1,61 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - A Quick Tour of Wicket</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>A Quick Tour of Wicket | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
 
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
-</div>
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
 
-		<div id="contentbody">
-			<h1>A Quick Tour of Wicket</h1>
-			<p>Nothing says more about a development technology than a few simple examples.
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/examples -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/examples -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/examples -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/examples -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/examples -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/examples -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>A Quick Tour of Wicket</h1>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>Nothing says more about a development technology than a few simple examples.
 After all, how hard should it be to do something easy? The examples below
 should speak for themselves in demonstrating how easy it is to get things done
 in Wicket when compared to other frameworks. You will discover that Wicket’s
 component-oriented structure and its “low touch” approach to HTML is quite
 inviting.</p>
-
-<p>You can see these examples and many more in <a href="http://www.wicket-library.com/wicket-examples-6.0.x">live
+<p>You can see these examples and many more in <a href="http://www.wicket-library.com">live
 action</a> without having to install anything.</p>
-
 <ul>
   <li><a href="helloworld.html">Hello World!</a> - Everybody’s favorite example</li>
   <li><a href="navomatic.html">Navomatic</a> - Automatic navigation using Borders and Links</li>
@@ -210,17 +70,19 @@ features building a counter.</li>
   <li><a href="usingfragments.html">Using Fragments</a> - A short example explaining Wicket’s
 fragments feature. Fragments are a type of inline panels.</li>
 </ul>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/examples/markupinheritance.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/markupinheritance.html b/content/learn/examples/markupinheritance.html
index b106d21..f171e92 100644
--- a/content/learn/examples/markupinheritance.html
+++ b/content/learn/examples/markupinheritance.html
@@ -1,229 +1,81 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Creating layouts using markup inheritance</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Creating layouts using markup inheritance | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/examples/markupinheritance.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
 </div>
-
-		<div id="contentbody">
-			<h1>Creating layouts using markup inheritance</h1>
-			<p>This markup inheritance example show you how to create reusable page layouts
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Creating layouts using markup inheritance</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#page-layout"><span class="toc-number">1</span> <span class="toc-text">Page layout</span></a></li><li class="toc--level-1 toc--section-2"><a href="#what-is-markup-inheritance"><span class="toc-number">2</span> <span class="toc-text">What is markup inheritance?</span></a></li><li class="toc--level-1 toc--section-3"><a href="#implementing-the-basepage"><span class="toc-number">3</span> <span class="toc-text">Implementing the BasePage</span></a></li><li class="toc--level-1 toc--section-4"><a href="#implementing-the-sub-pages"><span class="toc-number">4</span> <span class="toc-text">Implementing the sub pages</span></a></li><li class="toc--level-1 toc--section-5"><a href="#conclusion"><span class="toc-number">5</span> <span class="toc-text">Conclusion</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>This markup inheritance example show you how to create reusable page layouts
 and panel layouts.</p>
-
 <p><a href="http://wicket.apache.org/screencasts/ApacheWicket_MarkupInheritence.avi">Watch the Screencast</a></p>
-
 <p>In all the Wicket examples, you have to put all files in the same package
 directory. This means putting the markup files and the java files next to one
 another. It is possible to alter this behavior, but that is beyond the scope
 of this example. The only exception is the obligatory <code>web.xml</code> file which
 should reside in the <code>WEB-INF/</code> directory of your web application root
 folder.</p>
-
 <p>In this example we assume you already have read and understood the other
 examples which give you information on the structure and nature of Wicket
 applications. Specifically read and understand the <a href="helloworld.html">Hello, World
 example</a>.</p>
-
 <h2 id="page-layout">Page layout</h2>
-
 <p>In the next figure we show a standard strategy for laying out a page. A
 standard header, the main content body and a standard footer.</p>
-
 <p><img src="markupinheritance1.png" alt="Markup inheritance diagram" /></p>
-
 <p>In Wicket you can achieve this using different strategies. This article
 focuses on one strategy: markup inheritance.</p>
-
 <h2 id="what-is-markup-inheritance">What is markup inheritance?</h2>
-
 <p>In Java you can extend classes. This same concept has been fitted into the
 markup parsing of Java. Markup containers that have files associated (page
 and panels) can inherit the markup of their super containers.</p>
-
 <p>This is done using two special Wicket tags: <code>&lt;wicket:child&gt;</code> and
 <code>&lt;wicket:extend&gt;</code>. In the super markup you define where the child markup
 should be put, and in the sub markup you delineate where the child markup
 starts and ends.</p>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
     <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
     <span class="nt">&lt;body&gt;</span>
@@ -232,12 +84,10 @@ starts and ends.</p>
         This is in the super markup.<span class="nt">&lt;br&gt;</span>
     <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>In this markup you see two sentences that surround the <code>&lt;wicket:child&gt;</code> tag.
 All markup in this file will remain when a sub class of this page is created,
 only the <code>&lt;wicket:child&gt;</code> tag will be replaced with the child markup. So if we
 look at the following markup:</p>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
@@ -248,12 +98,10 @@ look at the following markup:</p>
     This is in the child markup.<span class="nt">&lt;br&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>we can see the markup that should be included in the parent. Only the markup
 between the <code>&lt;wicket:extend&gt;</code> tags is included in the final page. Take a look
 at the following markup which is the final markup when you would use this in
 a Wicket application.</p>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
@@ -264,24 +112,18 @@ a Wicket application.</p>
     This is in the super markup.<span class="nt">&lt;br&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>Here you can see that the <code>&lt;wicket:child /&gt;</code> tag has been expanded, and its
 contents filled with exactly the markup between the <code>&lt;wicket:extend&gt;</code> tags.
 If you want to get rid of the special Wicket tags, you can disable that on
 the markup settings
 (<a href="http://wicketframework.org/api/wicket/settings/IMarkupSettings">IMarkupSettings</a>).</p>
-
 <h2 id="implementing-the-basepage">Implementing the BasePage</h2>
-
 <p>Now that we have seen the basics for markup inheritance, we can take a
 look at the example at hand. Let’s first create the base page.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">quickstart</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">wicket.markup.html.WebPage</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.link.BookmarkablePageLink</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">abstract</span> <span class="kd">class</span> <span class="nc">BasePage</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
 	<span class="kd">public</span> <span class="nf">BasePage</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">BookmarkablePageLink</span><span class="o">(</span><span class="s">&quot;page1&quot;</span><span class="o">,</span> <span class="n">Page1</span><span class="o">.</span><span class="na">class</span><span class="o">));</span>
@@ -289,11 +131,9 @@ look at the example at hand. Let’s first create the base page.</p>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">Label</span><span class="o">(</span><span class="s">&quot;footer&quot;</span><span class="o">,</span> <span class="s">&quot;This is in the footer&quot;</span><span class="o">));</span>
 	<span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <p>The two links should go into the header, and the footer in the footer of the
 page. Note that the abstract keyword isn’t required, but considered a good
 practise. Now let’s take a look at the markup for the BasePage</p>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
@@ -309,41 +149,31 @@ practise. Now let’s take a look at the markup for the BasePage</p>
 <span class="nt">&lt;/div&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>In this markup file you see the specific basic layout: we have 3 div
 elements:</p>
-
 <ol>
   <li><code>&lt;div id="header"&gt;...&lt;/div&gt;</code></li>
   <li><code>&lt;div id="body"&gt;...&lt;/div&gt;</code></li>
   <li><code>&lt;div id="footer"&gt;...&lt;/div&gt;</code></li>
 </ol>
-
 <p>Note that these aren’t Wicket components, just plain markup. We could have
 made them components, such as a <code>Panel</code> but for brevity we keep it this way.
 Now that we have the <code>BasePage</code> finished, we can implement the two subclasses
 to finish this example.</p>
-
 <h2 id="implementing-the-sub-pages">Implementing the sub pages</h2>
-
 <p>We need to build two pages: <code>Page1</code> and <code>Page2</code>. Each page needs its own
 markup file and Java class. Let’s first implement <code>Page1</code>.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">quickstart</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page1</span> <span class="kd">extends</span> <span class="n">BasePage</span> <span class="o">{</span>
 	<span class="kd">public</span> <span class="nf">Page1</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">Label</span><span class="o">(</span><span class="s">&quot;label1&quot;</span><span class="o">,</span> <span class="s">&quot;This is in the subclass Page1&quot;</span><span class="o">));</span>
 	<span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <p>In this example you see that we add a new label component to the page:
 <code>label1</code>. This component is only available for <code>Page1</code>, as such <code>Page2</code> can
 define its own component hierarchy. Let’s take a look at the markup for
 <code>Page1</code>:</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;</span>
 <span class="o">&lt;</span><span class="n">head</span><span class="o">&gt;&lt;/</span><span class="n">head</span><span class="o">&gt;</span>
 <span class="o">&lt;</span><span class="n">body</span><span class="o">&gt;</span>
@@ -353,23 +183,17 @@ define its own component hierarchy. Let’s take a look at the markup for
 <span class="o">&lt;/</span><span class="nl">wicket:</span><span class="n">extend</span><span class="o">&gt;</span>
 <span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;</span>
 <span class="o">&lt;/</span><span class="n">html</span><span class="o">&gt;</span></code></pre></div>
-
 <p>Here you see that we added the <code>Label</code> component in the markup between the
 <code>&lt;wicket:extend&gt;</code> tags. If we were to add the component outside those tags,
 Wicket will not be able to render the component in the final page.</p>
-
 <p>Now, let’s do the same for <code>Page2</code>.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">quickstart</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page2</span> <span class="kd">extends</span> <span class="n">BasePage</span> <span class="o">{</span>
 	<span class="kd">public</span> <span class="nf">Page2</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">Label</span><span class="o">(</span><span class="s">&quot;label2&quot;</span><span class="o">,</span> <span class="s">&quot;This is in the subclass Page2&quot;</span><span class="o">));</span>
 	<span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
@@ -379,40 +203,35 @@ Wicket will not be able to render the component in the final page.</p>
 <span class="nt">&lt;/wicket:extend&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>In <code>Page2</code> you see that we have a different component structure (<code>label2</code>
 instead of <code>label1</code>), and as such that the pages are quite different.</p>
-
 <p>If you paste this code into a Wicket quickstart application, you can see it
 immediately working (don’t forget to set the homepage to <code>Page1</code> or <code>Page2</code>).</p>
-
 <h2 id="conclusion">Conclusion</h2>
-
 <p>With markup inheritance you can get a standard layout for your application
 without too much hassle. It follows the natural inheritance strategy for Java
 code and makes encapsulation of your component hierarchy possible.</p>
-
 <p>In this example we haven’t touched on the other possible features of markup
 inheritance:</p>
-
 <ul>
   <li>contributing to the <code>&lt;head&gt;</code> section from your sub pages</li>
   <li>multiple layers of inheritance (this just works)</li>
   <li>markup inheritance used with <code>Panel</code> components</li>
 </ul>
-
 <p>However, this example should get you up and running.</p>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/examples/navomatic.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/navomatic.html b/content/learn/examples/navomatic.html
index 9b07a19..194d96a 100644
--- a/content/learn/examples/navomatic.html
+++ b/content/learn/examples/navomatic.html
@@ -1,236 +1,86 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Navomatic</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Navomatic | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/examples/navomatic.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
 </div>
-
-		<div id="contentbody">
-			<h1>Navomatic</h1>
-			<p>The Navomatic application shows the use of border components and links to
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Navomatic</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#navigation-component"><span class="toc-number">1</span> <span class="toc-text">Navigation component</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#border-markup"><span class="toc-number">1.1</span> <span class="toc-text">Border markup</span></a></li><li class="toc--level-2 toc--section-3"><a href="#border-usage"><span class="toc-number">1.2</span> <span class="toc-text">Border usage</span></a></li><li class="toc--level-2 toc--section-4"><a href="#rendered-markup"><span class="toc-number">1.3</span> <span class="toc-text">Rendered markup</span></a></li><li class="toc--level-2 toc--section-5"><a href="#navomaticapplicationjava"><span class="toc-number">1.4</span> <span class="toc-text">NavomaticApplication.java</span></a></li><li class="toc--level-2 toc--section-6"><a href="#page1java"><span class="toc-number">1.5</span> <span
  class="toc-text">Page1.java</span></a></li><li class="toc--level-2 toc--section-7"><a href="#page1html"><span class="toc-number">1.6</span> <span class="toc-text">Page1.html</span></a></li><li class="toc--level-2 toc--section-8"><a href="#page2java"><span class="toc-number">1.7</span> <span class="toc-text">Page2.java</span></a></li><li class="toc--level-2 toc--section-9"><a href="#page2html"><span class="toc-number">1.8</span> <span class="toc-text">Page2.html</span></a></li><li class="toc--level-2 toc--section-10"><a href="#navomaticborderjava"><span class="toc-number">1.9</span> <span class="toc-text">NavomaticBorder.java</span></a></li><li class="toc--level-2 toc--section-11"><a href="#navomaticborderhtml"><span class="toc-number">1.10</span> <span class="toc-text">NavomaticBorder.html</span></a></li><li class="toc--level-2 toc--section-12"><a href="#webxml"><span class="toc-number">1.11</span> <span class="toc-text">web.xml</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>The Navomatic application shows the use of border components and links to
 create a navigation component that can easily be dropped into any web page.</p>
-
 <p>In all the Wicket examples, you have to put all files in the same package
 directory. This means putting the markup files and the java files next to one
 another. It is possible to alter this behavior, but that is beyond the scope
 of this example. The only exception is the obligatory web.xml file which
 should reside in the WEB-INF/ directory of your web application root folder.</p>
-
 <p>The link in the navigation to the current page is automatically turned into
 italic text to indicate to the user what page they are on. The first screen
 capture shows the Page1 page with the Page1 link in italics.</p>
-
 <p><img src="navomatic1.png" alt="Figure 1" /></p>
-
 <p>When you click on the Page2 link, you get the following screen.</p>
-
 <p><img src="navomatic2.png" alt="Figure 2" /></p>
-
 <p>As you can see, Page1 has no special style anymore, and Page2 is now displayed
 in italics. Also the message box shows that we are viewing Page2 instead of
 Page1.</p>
-
 <h2 id="navigation-component">Navigation component</h2>
-
 <p>To create a reusable navigation component we are going to use a
 <code>org.apache.wicket.markup.html.border.Border</code> component. From the Border
 Javadoc:</p>
-
 <blockquote>
   <p>A border component has associated markup which is drawn and determines
 placement of any markup and/or components nested within the border 
 component.</p>
 </blockquote>
-
 <p>The portion of the border’s associated markup file which is to be used in
 rendering the border is denoted by a <code>&lt;wicket:border&gt;</code> tag. The children of the
 border component instance are then inserted into this markup, replacing the
 first <code>&lt;wicket:body/&gt;</code> tag in the border’s associated markup.</p>
-
 <p>For example, here is markup for a simple Border subclass, a usage of that
 border, and the markup which would be output on rendering:</p>
-
 <h3 id="border-markup">Border markup</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;wicket:border&gt;</span>
@@ -238,9 +88,7 @@ border, and the markup which would be output on rendering:</p>
     <span class="nt">&lt;/wicket:border&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <h3 id="border-usage">Border usage</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
   <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span class="err"> </span><span class="s">&quot;myBorder&quot;</span><span class="nt">&gt;</span>
@@ -248,56 +96,40 @@ border, and the markup which would be output on rendering:</p>
   <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <h3 id="rendered-markup">Rendered markup</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
       First Middle Last
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>In other words, the markup around the <code>&lt;wicket:body/&gt;</code> tag in the border
 component is sort of “wrapped around” the body of the <code>&lt;span&gt;</code> tag where the
 border is used. This seems simple in this example, but keep in mind that
 nested components and even nested borders can appear anywhere in either markup
 file. This can be used to create quite complex effects with relatively little
 code.</p>
-
 <h3 id="navomaticapplicationjava">NavomaticApplication.java</h3>
-
 <p>Just as in the Hello World! example, we need to define our application. In
 this case, we set Page1 to be our home page.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">wicket</span><span class="o">.</span><span class="na">examples</span><span class="o">.</span><span class="na">navomatic</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">org.apache.wicket.protocol.http.WebApplication</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">NavomaticApplication</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">NavomaticApplication</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
-   
     <span class="kd">public</span> <span class="n">Class</span> <span class="nf">getHomePage</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">Page1</span><span class="o">.</span><span class="na">class</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <h3 id="page1java">Page1.java</h3>
-
 <p>The Page1 Java and HTML files look like this:</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">examples</span><span class="o">.</span><span class="na">navomatic</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.WebPage</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page1</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">Page1</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">NavomaticBorder</span><span class="o">(</span><span class="s">&quot;navomaticBorder&quot;</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <h3 id="page1html">Page1.html</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span> 
     <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span class="err"> </span><span class="s">&quot;navomaticBorder&quot;</span><span class="nt">&gt;</span>
@@ -305,26 +137,20 @@ this case, we set Page1 to be our home page.</p>
     <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>Notice that the NavomaticBorder component is attached to the <code>&lt;span&gt;</code> tag
 because the name of the component in the Java code is “navomaticBorder” and
 the <code>&lt;span&gt;</code> tag’s wicket:id attribute is set to “navomaticBorder”. Because the
 two names match, Wicket associates the NavomaticBorder Java component with the
 <code>&lt;span&gt;</code> tag.</p>
-
 <h3 id="page2java">Page2.java</h3>
-
 <p>The Page2 Java and HTML files look almost identical (and we’ll omit the
 sources for Page3 altogether because it follows the same pattern):</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page2</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">Page2</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="nf">NavomaticBorder</span><span class="o">(</span><span class="s">&quot;navomaticBorder&quot;</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <h3 id="page2html">Page2.html</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span class="err"> </span><span class="s">&quot;navomaticBorder&quot;</span><span class="nt">&gt;</span>
@@ -332,30 +158,22 @@ sources for Page3 altogether because it follows the same pattern):</p>
     <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <h3 id="navomaticborderjava">NavomaticBorder.java</h3>
-
 <p>So how does NavomaticBorder work? Glad you asked. The Java code below simply
 adds the two BoxBorder components you see. These components are nested borders
 which each draw a thin black line around their contents. The rest of the magic
 is in the NavomaticBorder markup.</p>
-
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">examples</span><span class="o">.</span><span class="na">navomatic</span><span class="o">;</span>
-
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.border.Border</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.border.BoxBorder</span><span class="o">;</span>
-
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">NavomaticBorder</span> <span class="kd">extends</span> <span class="n">Border</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="nf">NavomaticBorder</span><span class="o">(</span><span class="kd">final</span> <span class="n">String</span> <span class="n">componentName</span><span class="o">)</span> <span class="o">{</span>
         <span class="kd">super</span><span class="o">(</span><span class="n">componentName</span><span class="o">);</span>
-
         <span class="n">addToBorder</span><span class="o">(</span><span class="k">new</span> <span class="nf">BoxBorder</span><span class="o">(</span><span class="s">&quot;navigationBorder&quot;</span><span class="o">));</span>
         <span class="n">addToBorder</span><span class="o">(</span><span class="k">new</span> <span class="nf">BoxBorder</span><span class="o">(</span><span class="s">&quot;bodyBorder&quot;</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></div>
-
 <h3 id="navomaticborderhtml">NavomaticBorder.html</h3>
-
 <div class="highlight"><pre><code class="language-html" data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;wicket:border&gt;</span> 
@@ -385,20 +203,17 @@ is in the NavomaticBorder markup.</p>
     <span class="nt">&lt;/wicket:border&gt;</span>
  <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span></code></pre></div>
-
 <p>Notice that the markup above encloses the entire contents of the markup file’s
 <code>&lt;body&gt;</code> with a <code>&lt;wicket:border&gt;</code> tag, as we described earlier. This lets the
 NavomaticBorder know how much of its markup to use when it wraps itself around
 the markup it finds in the context where it is used. Notice also the
 <code>&lt;wicket:body/&gt;</code> marker which designates where to put whatever is found inside
 the tag at the use context.</p>
-
 <p>Next, notice that the navigation links and the border’s <code>&lt;wicket:body/&gt;</code> are
 both enclosed in <code>&lt;span&gt;</code> tags which have wicket:id attributes that associate
 those tags with the BoxBorder components added in the NavomaticBorder
 constructor. These nested border components will each draw a thin black line
 around their contents.</p>
-
 <p>Finally, the <code>&lt;wicket:link&gt;</code> tag is used to mark the links in the navigation
 as automatic links. Ordinarily, you would need to create link components and
 attach them to your page manually, but anchor links that are marked as
@@ -406,13 +221,10 @@ automatic are parsed and hooked up to link components for you, as appropriate.
 The italicizing behavior is also automatic. Since Wicket knows which page is
 current, it removes the anchor link tag for any link that points to the
 current page (since the link would be useless) and italicizes the link text.</p>
-
 <h3 id="webxml">web.xml</h3>
-
 <p>In order to get this application up and running, we need to register the
 application with the Wicket servlet in the web.xml file. The following
 sections need to be added to the web.xml in the WEB-INF folder.</p>
-
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;servlet&gt;</span>
     <span class="nt">&lt;servlet-name&gt;</span>NavomaticApplication<span class="nt">&lt;/servlet-name&gt;</span>
     <span class="nt">&lt;servlet-class&gt;</span>org.apache.wicket.protocol.http.WicketServlet<span class="nt">&lt;/servlet-class&gt;</span>
@@ -426,18 +238,19 @@ sections need to be added to the web.xml in the WEB-INF folder.</p>
     <span class="nt">&lt;servlet-name&gt;</span>NavomaticApplication<span class="nt">&lt;/servlet-name&gt;</span>
     <span class="nt">&lt;url-pattern&gt;</span>/app/*<span class="nt">&lt;/url-pattern&gt;</span>
 <span class="nt">&lt;/servlet-mapping&gt;</span></code></pre></div>
-
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>