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:29 UTC

[17/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/books/iaw6.html
----------------------------------------------------------------------
diff --git a/content/learn/books/iaw6.html b/content/learn/books/iaw6.html
new file mode 100644
index 0000000..83a74a6
--- /dev/null
+++ b/content/learn/books/iaw6.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Books — Instant Apache Wicket 6 | 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/books/iaw6.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/iaw6.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/iaw6.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/iaw6.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/iaw6.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/iaw6.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>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books — Instant Apache Wicket 6</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="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#what-you-will-learn-from-this-book"><span class="toc-number">2</span> <span class="toc-text">What you will learn from this book</span></a></li><li class="toc--level-1 toc--section-3"><a href="#approach"><span class="toc-number">3</span> <span class="toc-text">Approach</span></a></li><li class="toc--level-1 toc--section-4"><a href="#who-this-book-is-written-for"><span class="toc-number">4</span> <span class="toc-text">Who this book is written for</span></a></li><li class="toc--level-1 toc--section-5"><a href="#about-the-authors"><span class="toc-number">5</span> <span class="toc-text">About the authors</span></a></li><li class="toc--level-1 toc--section-6"><a href="#book-details"><span class="toc-n
 umber">6</span> <span class="toc-text">Book details</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="description">Description</h2>
+<p>Wicket is a component-based Java web framework. In Wicket, the server side state is automatically managed as it is associated with components. With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, Apache Wicket makes developing web-apps simple and enjoyable. There are no configuration files to learn in Wicket as it has powerful and reusable components written with plain Java and HTML. Instant Apache Wicket 6 will take you through the entire process of building web application using the Wicket frame work.</p>
+<p>Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an amazing Java framework. After you finish this book, you will be capable of developing Wicket applications, using the knowledge acquired in the book to explore more of the technology, and even contribute to Wicket’s community.</p>
+<p>Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advantages, and then goes on to show how to set up the Wicket environment and how to build a “hello world” and a sign-in/sign-out application. After you learn the Wicket core concepts and apply them to the sign-in/sign-out app, you will use Maven in Eclipse to build Wicket applications. You will learn important concepts like lifecycle (objects and requests), models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, wicket:extend, and wicket:child), and behaviors.</p>
+<h2 id="what-you-will-learn-from-this-book">What you will learn from this book</h2>
+<ul>
+  <li>Learn something new in an Instant! A short, fast, focused guide delivering immediate results</li>
+  <li>Learn to build a Wicket application</li>
+  <li>Get to grips with the core concepts of Wicket</li>
+  <li>Understand the lifecycle of Wicket</li>
+</ul>
+<h2 id="approach">Approach</h2>
+<p>Get to grips with a new technology, understand what it is and what it can do for you, and then get to work with the most important features and tasks. This Starter style guide takes the reader through the basic workflow of Apache Wicket in a practical and friendly style.</p>
+<h2 id="who-this-book-is-written-for">Who this book is written for</h2>
+<p>Instant Apache Wicket 6 is for people who want to learn the basics of Apache Wicket 6 and who already have some experience with Java and object-oriented programming. Basic knowledge of web concepts like HTTP and Ajax will be an added advantage.</p>
+<h2 id="about-the-authors">About the authors</h2>
+<p>About the Authors</p>
+<p>João Sávio Ceregatti Longo</p>
+<p>João Sávio Ceregatti Longo has a Bachelor’s and Master’s degree in Computer Science. He also has a strong background in the Java programming language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast. He is currently working at Daitan Group - http://www.daitangroup.com.</p>
+<p>Felipe Fedel Pinto</p>
+<p>Felipe Fedel Pinto holds a Bachelor’s degree in Computer Science and has been developing and managing projects using Wicket since 2010. He also collaborates on open source Wicket projects. He is partner and Software Architect at Ampliato - http://www.ampliato.com.br.</p>
+<h2 id="book-details">Book details</h2>
+<table>
+	<tr>
+		<th>Title</th>
+		<td>Instant Apache Wicket 6</td>
+	</tr>
+	<tr>
+		<th>Authors</th>
+		<td>João Sávio Ceregatti Longo, Felipe Fedel Pinto</td>
+	</tr>
+	<tr>
+		<th>Version covered</th>
+		<td>Wicket 6</td>
+	</tr>
+	<tr>
+		<th>Publisher URL</th>
+		<td><a href="https://www.packtpub.com/web-development/instant-apache-wicket-6-instant">Instant Apache Wicket 6</a></td>
+	</tr>
+	<tr>
+		<th>Paperback</th>
+		<td>54 pages</td>
+	</tr>
+	<tr>
+		<th>Date</th>
+		<td>August 2013</td>
+	</tr>
+	<tr>
+		<th>Language</th>
+		<td>English</td>
+	</tr>
+	<tr>
+		<th>ISBN-10</th>
+		<td>1783280026</td>
+	</tr>
+	<tr>
+		<th>ISBN-13</th>
+		<td>978-1-78328-001-8</td>
+	</tr>
+	<tr>
+		<th>Buy</th>
+		<td><a href="https://www.packtpub.com/web-development/instant-apache-wicket-6-instant">PACKT Publishing</a></td>
+	</tr>
+</table>
+        </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>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/books/iaw6.png
----------------------------------------------------------------------
diff --git a/content/learn/books/iaw6.png b/content/learn/books/iaw6.png
new file mode 100644
index 0000000..8f68865
Binary files /dev/null and b/content/learn/books/iaw6.png differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/books/index.html
----------------------------------------------------------------------
diff --git a/content/learn/books/index.html b/content/learn/books/index.html
index cfb304e..1e5cabf 100644
--- a/content/learn/books/index.html
+++ b/content/learn/books/index.html
@@ -1,214 +1,77 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Books about Wicket</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Books about 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" />
-
-    <!--[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>
-
-		<div id="contentbody">
-			<h1>Books about Wicket</h1>
-			<p>Several books have been written about Apache Wicket, 5 in English, 2 in German
-and 1 in Japanese. Click on a cover to learn more about each book.</p>
-
-<p><a href="awc.html"><img src="awc.png" height="300px" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
-<a href="wia.html"><img src="wia.png" height="300px" alt="Wicket in Action cover" title="Wicket in Action" /></a>
-<a href="koda.html"><img src="koda.jpg" height="300px" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
-<a href="ewdww.html"><img src="ewdww.png" height="300px" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
-<a href="prowicket.html"><img src="prowicket.png" height="300px" alt="Pro Wicket cover" title="Pro Wicket" /></a>
-<a href="paxisbuchwicket.html"><img src="praxisbuchwicket.png" height="300px" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
-<a href="kwij.html"><img src="kwij.png" height="300px" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
-<a href="wicket-jp.html"><img src="wicket-jp.png" height="300px" alt="Wicket Japanese cover" title="Wicket Japanese" /></a></p>
+        <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>
 
-		</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>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/books -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books -->
+    	<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>
-</body>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books about Wicket</h1>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>Several books have been written about Apache Wicket, 5 in English, 3 in German
+and 1 in Japanese. Click on a cover to learn more about each book.</p>
+<p><a href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
+<a href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
+<a href="wia.html"><img src="wia.png" alt="Wicket in Action cover" title="Wicket in Action" /></a>
+<a href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
+<a href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
+<a href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" title="Pro Wicket" /></a>
+<a href="paxisbuchwicket.html"><img src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
+<a href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
+<a href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" title="Wicket Japanese" /></a></p>
+        </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>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/books/koda.html
----------------------------------------------------------------------
diff --git a/content/learn/books/koda.html b/content/learn/books/koda.html
index 46d54ef..0f00517 100644
--- a/content/learn/books/koda.html
+++ b/content/learn/books/koda.html
@@ -1,193 +1,55 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework | 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>
 
-		<div id="contentbody">
-			<h1>Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework</h1>
-			<h2 id="description">Description</h2>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/books/koda.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/koda.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/koda.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/koda.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/koda.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/koda.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>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework</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="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="description">Description</h2>
 <p>Apache Wicket ist ein komponentbasiertes Webframework, das sich in den
 letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung
 gemausert hat. Man könnte diese Beliebtheit mit der einfachen
@@ -198,7 +60,6 @@ und das objektorientierte Programmiermodell. Dadurch rücken Java und
 seine Sprachmittel stark in den Vordergrund. Das ermöglicht es
 erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket
 einzusteigen und auch komplexeste Anwendungen umzusetzen.</p>
-
 <p>Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu
 vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte
 einzugehen. Hierzu wird eine Beispielanwendung entwickelt und Schritt
@@ -214,32 +75,29 @@ Komponenten zu erweitern.
 Zielgruppe
 Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der
 wichtigen Webtechnologien wie HTML und CSS</p>
-
 <h2 id="about-the-author">About the author</h2>
-
 <p>Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und
 Entwicklung. Derzeit ist er bei der Senacor Technologies AG für
 verschiedene Wicket-Projekte als Technical Lead verantwortlich.</p>
-
 <h2 id="book-details">Book details</h2>
-
 <p>Titel   Wicket: Komponentenbasiert und objektorientiert- das alternative Java-Webframework
 Autor   Jochen Mader
 Verlag  Software + Support, 2012
 ISBN    3868020810, 9783868020816
 Länge   219 Seiten</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/books/koda.png
----------------------------------------------------------------------
diff --git a/content/learn/books/koda.png b/content/learn/books/koda.png
new file mode 100644
index 0000000..779b514
Binary files /dev/null and b/content/learn/books/koda.png differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/learn/books/kwij.html
----------------------------------------------------------------------
diff --git a/content/learn/books/kwij.html b/content/learn/books/kwij.html
index d44a15b..0e16a00 100644
--- a/content/learn/books/kwij.html
+++ b/content/learn/books/kwij.html
@@ -1,196 +1,57 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Books — Wicket - Komponentenbasierte Webanwendungen in Java</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>Books — Wicket - Komponentenbasierte Webanwendungen in Java | 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/books/kwij.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/kwij.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/kwij.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/kwij.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/kwij.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/kwij.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>Books — Wicket - Komponentenbasierte Webanwendungen in Java</h1>
-			<p>The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart. It
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books — Wicket - Komponentenbasierte Webanwendungen in Java</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="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart. It
 was published by dpunkt.verlag in December 2009.</p>
-
 <h2 id="description">Description</h2>
-
 <p>Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache
 rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer,
 XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
@@ -209,9 +70,7 @@ architektonisch sauber aufgebaut werden können. Umsteiger von anderen
 Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket
 kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen
 schrittweise nach Wicket zu migrieren.</p>
-
 <p>Aus dem Inhalt:</p>
-
 <ul>
   <li>Aufbau einer Wicket-Anwendung</li>
   <li>Wicket-Komponenten (von Basiskomponenten bis zu selbst definierten Komponenten)</li>
@@ -220,29 +79,21 @@ schrittweise nach Wicket zu migrieren.</p>
   <li>Testen von Wicket-Anwendungen</li>
   <li>Weiterführende Themen wie Lokalisierung, Versionierung, Migration</li>
 </ul>
-
 <p>Zielgruppe:</p>
-
 <p>Webentwickler Java-Entwickler Softwarearchitekten</p>
-
 <h2 id="about-the-author">About the author</h2>
-
 <p>Roland Förther ist Chief Developer bei der Senacor Technologies AG in
 Nürnberg. Seine Arbeitsschwerpunkte sind u.a. Client-Anwendungen in C unter
 Unix/X11 sowie in Java/Swing, Webanwendungen in Java/Struts und Ruby on Rails.
 Er studierte Informatik an der Friedrich-Alexander-Universität in Erlangen.</p>
-
 <p>Carl-Eric Menzel arbeitet als Senior Developer bei der Senacor Technologies
 AG. Er beschäftigt sich dort mit den Themen Middleware-Entwicklung im
 Java-Enterprise-Bereich, Java-Webanwendungen sowie Usability. Er studierte
 Informatik an der FH Furtwangen.</p>
-
 <p>Olaf Siefart ist Chief Developer bei der Senacor Technologies AG, wo er mit
 J2EE-Applikationen und Client-Architekturen (Webanwendungen) arbeitet. Er
 absolvierte sein Studium der Informatik an der Universität Marburg.</p>
-
 <h2 id="book-details">Book details</h2>
-
 <p>Title	Wicket: Komponentenbasierte Webanwendungen in Java
 Author	Roland Förther, Carl-Eric Menzel and Olaf Siefart
 Version covered	 Wicket 1.4
@@ -253,17 +104,19 @@ Date	December, 2009
 Language	German
 ISBN-13	978-3-89864-569-0
 Buy	dpunkt Amazon</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/books/praxisbuchwicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/praxisbuchwicket.html b/content/learn/books/praxisbuchwicket.html
index 13b7300..755f4f2 100644
--- a/content/learn/books/praxisbuchwicket.html
+++ b/content/learn/books/praxisbuchwicket.html
@@ -1,198 +1,58 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Books — Praxisbuch Wicket</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>Books — Praxisbuch 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="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/books/praxisbuchwicket.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/praxisbuchwicket.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/praxisbuchwicket.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/praxisbuchwicket.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/praxisbuchwicket.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/praxisbuchwicket.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>Books — Praxisbuch Wicket</h1>
-			<p>Praxisbuch Wicket, written by by Michael Mosmann. It was published by Hanser
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books — Praxisbuch Wicket</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="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>Praxisbuch Wicket, written by by Michael Mosmann. It was published by Hanser
 Fachbuch in September 2009.</p>
-
 <h2 id="description">Description</h2>
-
 <p>DER SCHNELLE WEG ZU WEB 2.0</p>
-
 <p>Erfahren Sie, welch mächtige Unterstützung Wicket Java-Programmierern bei der
 Entwicklung von Web-2.0-Anwendungen bietet Folgen Sie Schritt für Schritt den
 praxisnahen Beispielen und erleben Sie, wie eine Anwendung mit Wicket
@@ -204,29 +64,22 @@ von Web-2.0-Anwendungen, die auf Java basieren. Es bietet eine einfache
 Integration von AJAX, ohne dass Sie sich mit XML oder JavaScript
 auseinandersetzen müssen, und erleichtert Ihnen die Wiederverwendung, weil es
 konsequent komponentenorientiert arbeitet.</p>
-
 <p>In diesem Buch erfahren Sie, wie Wicket Sie bei der Entwicklung von
 Web-2.0-Anwendungen unterstützt und welche Vorteile es bietet. Der Autor
 entwickelt gemeinsam mit Ihnen eine komplette Anwendung, erklärt unterwegs die
 wesentlichen Konzepte von Wicket und zeigt elegante, praxiserprobte Lösungen
 u.a. für Aufgabenstellungen wie suchmaschinenoptimierte Seiten oder
 Applikationen mit Desktop-Charakter.</p>
-
 <p>Das umfangreiche Kapitel “Wicket in der Praxis” bietet Ihnen eine Reihe von
 effektiven Lösungsvorschlägen für typische Aufgabenstellungen.</p>
-
 <p>Aus dem Inhalt: Die Grundstruktur aufsetzen und mit Leben füllen - Die
 Wicket-Architektur - Modelle - Komponenten - Basiskomponenten - Listen und
 Tabellen - Formulare - Sessions und Security - Wicket in der Praxis -
 Fehlersuche</p>
-
 <h2 id="about-the-author">About the author</h2>
-
 <p>Michael Mosmann has more than 10 years of Java experience, especially with web
 based b2c application.</p>
-
 <h2 id="book-details">Book details</h2>
-
 <p>Title	Praxisbuch Wicket: Professionelle Web-2.0-Anwendungen entwickeln
 Author	Michael Mosmann
 Version covered	 Wicket 1.4
@@ -238,18 +91,19 @@ Language	German
 ISBN-10	3446419098
 ISBN-13	978-3446419094
 Buy	Amazon Hanser</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/books/prowicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/prowicket.html b/content/learn/books/prowicket.html
index e9651fb..72af7fc 100644
--- a/content/learn/books/prowicket.html
+++ b/content/learn/books/prowicket.html
@@ -1,219 +1,75 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Books — Pro Wicket</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Books — Pro 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>
 
-		<div id="contentbody">
-			<h1>Books — Pro Wicket</h1>
-			<p>Pro Wicket, written by by Karthik Gurumurthy, is the first book about Wicket,
-and covers Wicket 1.2. It was published by Apress in September 2006.</p>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/books/prowicket.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/prowicket.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/prowicket.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/prowicket.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/prowicket.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/prowicket.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>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Books — Pro Wicket</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="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>Pro Wicket, written by by Karthik Gurumurthy, is the first book about Wicket,
+and covers Wicket 1.2. It was published by Apress in September 2006.</p>
 <h2 id="description">Description</h2>
-
 <p>Wicket is an open source, component-oriented (POJOs-based), lightweight Java
 web application development framework that brings the Java Swing event-based
 programming model to web development. Wicket pages can be mocked up,
 previewed, and later revised using standard WYSIWYG HTML design tools.</p>
-
 <p>Wicket provides stateful components, thereby improving productivity. It has an
 architecture and rich component suite that aims to bring back the object
 orientation and, more importantly, the fun that is missing from the Java web
 development space. With the impending 1.2 release, Wicket is set for wider
 adoption.</p>
-
 <p>Pro Wicket gets you up and running quickly with this framework. You’ll learn
 how to configure Wicket, then gradually gain exposure to the “Wicket way” of
 addressing web development requirements. You’ll want to pick up a copy because
 it</p>
-
 <p>Is the first book to cover the Wicket framework with Spring integration and
 Ajax features Demonstrates all major wicket capabilities through simple
 examples Covers important aspects like Wicket-Spring integration and Ajax
 support</p>
-
 <h2 id="about-the-author">About the author</h2>
-
 <p>Karthik Gurumurthy has been associated with the IT industry for more than six
 years now and has employed open source libraries to solve business problems.
 Karthik also has the experience of having documented a popular open source
@@ -222,9 +78,7 @@ of adoption and would like to let others know how Wicket succeeds in bringing
 back the fun that has been missing in the Java web development space. He also
 contributed to the Wicket project through the Wicket-Spring integration module
 using Jakarta Commons Attributes.</p>
-
 <h2 id="book-details">Book details</h2>
-
 <p>Title	Pro Wicket
 Author	Karthik Gurumurthy
 Version covered	 Wicket 1.2
@@ -236,18 +90,19 @@ Language	English
 ISBN-10	1590597222
 ISBN-13	978-1590597224
 Buy	Amazon Apress</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/books/wia.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wia.html b/content/learn/books/wia.html
index a2b3050..67f55ec 100644
--- a/content/learn/books/wia.html
+++ b/content/learn/books/wia.html
@@ -1,198 +1,58 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Wicket in Action</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Wicket in Action | 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>Wicket in Action</h1>
-			<p>Wicket in Action is written by Martijn Dashorst and Eelco Hillenius and is
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /learn/books/wia.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /learn/books/wia.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /learn/books/wia.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /learn/books/wia.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /learn/books/wia.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /learn/books/wia.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>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Wicket in Action</h1>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>Wicket in Action is written by Martijn Dashorst and Eelco Hillenius and is
 published by Manning. The book is currently in the final stages of production
 and will soon be available as a hard copy. Early access to the manuscript is
 available from the publishers site.</p>
-
 <h3 id="description">Description</h3>
-
 <p>There are dozens of Java frameworks out there, but most of them require you to
 learn special coding techniques and new, often rigid, patterns of development.
 Wicket is different. As a component-based Web application framework, Wicket
@@ -201,7 +61,6 @@ of plain old Java objects (POJOs), HTML, Ajax, Spring, Hibernate and Maven.
 Wicket automatically manages state at the component level, which means no more
 awkward HTTPSession objects. Its elegant programming model enables you to
 write rich web applications quickly.</p>
-
 <p>Wicket in Action is the authoritative, comprehensive guide for Java developers
 building Wicket-based Web applications. This book starts with an introduction
 to Wicket’s structure and components, and moves quickly into examples of
@@ -210,31 +69,29 @@ authoritative experts, this book shows you both the “how-to” and the “why
 Wicket. As you move through the book, you’ll learn to use and customize Wicket
 components, how to interact with other technologies like Spring and Hibernate,
 and how to build rich, Ajax-driven features into your applications.</p>
-
 <h3 id="authors">Authors</h3>
-
 <p>Martijn Dashorst is a software engineer with over 10 years of experience in
 software development. He has been actively involved in the Wicket project
 since it was open sourced, and has presented Wicket as a speaker at numerous
 conferences, including JavaOne and JavaPolis.</p>
-
 <p>Eelco Hillenius is an experienced software developer who has been part of
 Wicket’s core team almost from the start. He works for Teachscape where he
 helping to build the next elearning platform. A Dutch native, he currently
 lives in Seattle.</p>
-
 <h3 id="book-details">Book details</h3>
-
-		</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>