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

[36/53] [abbrv] [partial] wicket-site git commit: Preparing for wicket 7 site relaunch

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/contribute/userguide.html
----------------------------------------------------------------------
diff --git a/content/contribute/userguide.html b/content/contribute/userguide.html
new file mode 100644
index 0000000..dacc407
--- /dev/null
+++ b/content/contribute/userguide.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Contribute to the User Guide | 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 || /contribute/userguide.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/userguide.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/userguide.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/userguide.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/userguide.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/userguide.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>Contribute to the User Guide</h1>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>The user guide has been written using the doc engine from Grails project. You can find a reference for this format <a href="https://grails.org/WikiSyntax">here</a>.
+For more details about the format used to write the guide and to know how to contrinute, see <a href="/guide/guide/contributing.html">the relative chapter</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/230d6865/content/contribute/write.html
----------------------------------------------------------------------
diff --git a/content/contribute/write.html b/content/contribute/write.html
index 26289b0..3c49fba 100644
--- a/content/contribute/write.html
+++ b/content/contribute/write.html
@@ -1,197 +1,58 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Write documentation</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>Write documentation | 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 || /contribute/write.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/write.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/write.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/write.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/write.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/write.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>Write documentation</h1>
-			<p>We use <a href="http://github.com/mojombo/jekyll">Jekyll</a> for writing our
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Write documentation</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="#contents"><span class="toc-number">1</span> <span class="toc-text">Contents</span></a></li><li class="toc--level-1 toc--section-2"><a href="#introduction"><span class="toc-number">2</span> <span class="toc-text">Introduction</span></a></li><li class="toc--level-1 toc--section-3"><a href="#install"><span class="toc-number">3</span> <span class="toc-text">Install Jekyll</span></a></li><li class="toc--level-1 toc--section-4"><a href="#checkout"><span class="toc-number">4</span> <span class="toc-text">Check out from SVN</span></a></li><li class="toc--level-1 toc--section-5"><a href="#generate"><span class="toc-number">5</span> <span class="toc-text">Generating the site</span></a></li><li class="toc--level-1 toc--section-6"><a href="#run"><span class="toc-number">6</span> <span class="toc-text">Run the site</span></a></li><li class="toc--level-1 
 toc--section-7"><a href="#write"><span class="toc-number">7</span> <span class="toc-text">Write some documentation</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#page-template"><span class="toc-number">7.1</span> <span class="toc-text">Page template</span></a></li><li class="toc--level-2 toc--section-9"><a href="#syntax-highlighting"><span class="toc-number">7.2</span> <span class="toc-text">Syntax highlighting</span></a></li><li class="toc--level-2 toc--section-10"><a href="#menu"><span class="toc-number">7.3</span> <span class="toc-text">Menu</span></a></li><li class="toc--level-2 toc--section-11"><a href="#blog-posts"><span class="toc-number">7.4</span> <span class="toc-text">Blog posts</span></a></li></ul></li><li class="toc--level-1 toc--section-12"><a href="#update"><span class="toc-number">8</span> <span class="toc-text">Update the site</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>We use <a href="http://github.com/mojombo/jekyll">Jekyll</a> for writing our
 documentation on our main website. Publishing new content is as simple as
 regenerating the site and committing the changed files.</p>
-
 <h2 id="contents">Contents</h2>
-
 <ul>
   <li><a href="#introduction">Introduction</a></li>
   <li><a href="#install">Install Jekyll</a></li>
@@ -200,117 +61,109 @@ regenerating the site and committing the changed files.</p>
   <li><a href="#write">Write some documentation</a></li>
   <li><a href="#update">Update the site</a></li>
 </ul>
-
 <h2 id="introduction">Introduction</h2>
-
 <p>The site is split into two parts: static content and the official Apache
 Wicket blog. The static content contains all the documentation that is more
 static (such as mailing lists, downloads, examples). The blog includes release
 announcements, adding new committers and other important Wicket related news.</p>
-
 <h2 id="install">Install Jekyll</h2>
-
 <p>Follow the instructions available on the <a href="http://github.com/mojombo/jekyll">Jekyll
 website</a>. Basically it boils down to:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gem install jekyll</span></code></pre></div>
-
 <p>You also need to install the Pygments Python module.</p>
-
 <h2 id="checkout">Check out from SVN</h2>
-
 <p>Before you can edit the site, you need to check it out from SVN:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">svn co https://svn.apache.org/repos/asf/wicket/common/site/trunk wicket-site</span></code></pre></div>
-
 <h2 id="generate">Generating the site</h2>
-
 <p>You can regenerate the site in the checked out directory:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./regenerate.sh</span></code></pre></div>
-
 <p>Note that this script restores Subversion (<code>.svn</code>) subfolders
 inside <code>_site</code>, which are erased when Jekyll is generating the content.</p>
-
 <h2 id="run">Run the site</h2>
-
 <p>You can run the website and edit it live:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./liveedit.sh</span></code></pre></div>
-
 <p>This not only runs the server, but watches for modifications and regenerates
 any modified files.</p>
-
 <p>You can check out the website running at <a href="http://localhost:4000">localhost, port 4000</a>.</p>
-
 <h2 id="write">Write some documentation</h2>
-
 <p>Jekyll can render HTML from markdown syntax and textile syntax. <strong>For our site
-we use markdown</strong>. </p>
-
+we use markdown</strong>.</p>
 <h3 id="page-template">Page template</h3>
-
 <p>Each page needs to have a YAML preamble that specifies the rendered template
 and other variables. If it doesn’t include the YAML preamble, it won’t be
 rendered correctly.</p>
-
-<p>Example preamble (includes the <code>---</code>):</p>
-
+<p>The default layout supports a property to specify the main title for the page and 
+another property for an additional subtitle.</p>
+<p>For example: (the <code>---</code> must be included):</p>
 <div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
 <span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">default</span>
-<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Write documentation</span>
+<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Main title</span>
+<span class="l-Scalar-Plain">subtitle</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Subtitle</span>
 <span class="nn">---</span></code></pre></div>
-
+<p>A more advanced feature for the default layout is the ability to specify more files to include
+in the final page. This can be done with property <code>additionalContents</code> where we can list additional files
+with an id for their section tag and a value for the CSS class:</p>
+<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">default</span>
+<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Welcome to Apache Wicket</span>
+<span class="l-Scalar-Plain">subtitle</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Discover why developers love Wicket!</span>
+<span class="l-Scalar-Plain">additionalContents</span><span class="p-Indicator">:</span>
+  <span class="p-Indicator">-</span>
+   <span class="l-Scalar-Plain">path</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">anotherPage.html</span>
+   <span class="l-Scalar-Plain">sectionId</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">anotherPage</span>
+   <span class="l-Scalar-Plain">cssClass</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">sectionClass</span>
+  <span class="p-Indicator">-</span>
+   <span class="l-Scalar-Plain">path</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherPage.html</span>
+   <span class="l-Scalar-Plain">sectionId</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherPage</span>
+   <span class="l-Scalar-Plain">cssClass</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherSectionClass</span>
+<span class="nn">---</span></code></pre></div>
+<h4 id="additional-conventions">Additional conventions</h4>
+<p>The following conventions have been adopted for the templeates of the site pages:</p>
+<ul>
+  <li>Any link to static resources (css, js, pictures, etc.) is prefixed with <code>site.baseurl</code> to support <a href="http://jekyllrb.com/docs/github-pages/#project-page-url-structure">GitHub free hosting</a>. However, to run the project locally you don’t need to specify any baseurl.</li>
+  <li>Site posts use custom tag <code>&lt;!--more--&gt;</code> as <code>excerpt_separator</code>.</li>
+</ul>
 <h3 id="syntax-highlighting">Syntax highlighting</h3>
-
 <p>If you have a need to render code in your templates and have it syntax
 highlighted, surround the code with {\% highlight java \%} (substitute java
 with the language you want highlighted.)</p>
-
 <h3 id="menu">Menu</h3>
-
 <p>If you want your page linked from every page, include the link in
-<code>_includes/navigation.html</code>.</p>
-
+<code>_includes/header.html</code>.</p>
 <h3 id="blog-posts">Blog posts</h3>
-
 <p>For news items such as release announcements, new committers and other
 happenings, it is appriorate to create a blog post. The blog post is
 automatically added to the front page and the RSS feed.</p>
-
 <p>The blog items are written using the normal Jekyll syntax. The filename needs
 to be formatted as <code>yyyy-mm-dd-title.md</code> and the blog item should start with a
 YAML preamble, similar to normal pages:</p>
-
 <div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
 <span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">post</span>
 <span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Wicket 1.4.7 released</span>
 <span class="nn">---</span></code></pre></div>
-
 <h2 id="update">Update the site</h2>
-
 <p>When you’re done with making your changes, please check the following:</p>
-
 <ul>
   <li>Do the modified files contain only those changes that you actually want to
 publish? (Use <code>svn diff</code> to check)</li>
   <li>Did you restart Jekyll to generate the site?</li>
 </ul>
-
-<p>If these things are OK, you can either <a href="patch.html">generate a patch</a> when
+<p>If these things are OK, you can either <a href="http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.diff.html">generate a patch</a> when
 you’re not a committer, or just commit the changes. In the latter case, the
 modifications are pushed immediately to the site and are live within a minute.</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/230d6865/content/css/background.gif
----------------------------------------------------------------------
diff --git a/content/css/background.gif b/content/css/background.gif
deleted file mode 100644
index 8ae1bb7..0000000
Binary files a/content/css/background.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/bg_container.png
----------------------------------------------------------------------
diff --git a/content/css/bg_container.png b/content/css/bg_container.png
deleted file mode 100644
index d6119ef..0000000
Binary files a/content/css/bg_container.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/bg_menu.png
----------------------------------------------------------------------
diff --git a/content/css/bg_menu.png b/content/css/bg_menu.png
deleted file mode 100644
index 8fbbe2e..0000000
Binary files a/content/css/bg_menu.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/footer.png
----------------------------------------------------------------------
diff --git a/content/css/footer.png b/content/css/footer.png
deleted file mode 100644
index 234cd3e..0000000
Binary files a/content/css/footer.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/gh-fork-ribbon.css
----------------------------------------------------------------------
diff --git a/content/css/gh-fork-ribbon.css b/content/css/gh-fork-ribbon.css
deleted file mode 100644
index 5806121..0000000
--- a/content/css/gh-fork-ribbon.css
+++ /dev/null
@@ -1,140 +0,0 @@
-/*!
- * "Fork me on GitHub" CSS ribbon v0.1.1 | MIT License
- * https://github.com/simonwhitaker/github-fork-ribbon-css
-*/
-
-/* Left will inherit from right (so we don't need to duplicate code) */
-.github-fork-ribbon {
-  /* The right and left classes determine the side we attach our banner to */
-  position: absolute;
-
-  /* Add a bit of padding to give some substance outside the "stitching" */
-  padding: 2px 0;
-
-  /* Set the base colour */
-  background-color: #a00;
-
-  /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
-  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.15)));
-  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-
-  /* Add a drop shadow */
-  -webkit-box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.5);
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.5);
-
-  /* Set the font */
-  font: 700 13px "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-  z-index: 9999;
-  pointer-events: auto;
-}
-
-.github-fork-ribbon a,
-.github-fork-ribbon a:hover {
-  /* Set the text properties */
-  color: #fff;
-  text-decoration: none;
-  text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
-  text-align: center;
-
-  /* Set the geometry. If you fiddle with these you'll also need
-     to tweak the top and right values in .github-fork-ribbon. */
-  width: 200px;
-  line-height: 20px;
-
-  /* Set the layout properties */
-  display: inline-block;
-  padding: 2px 0;
-
-  /* Add "stitching" effect */
-  border-width: 1px 0;
-  border-style: dotted;
-  border-color: #fff;
-  border-color: rgba(255, 255, 255, 0.7);
-}
-
-.github-fork-ribbon-wrapper {
-  width: 150px;
-  height: 150px;
-  position: absolute;
-  overflow: hidden;
-  top: 0;
-  z-index: 9999;
-  pointer-events: none;
-}
-
-.github-fork-ribbon-wrapper.fixed {
-  position: fixed;
-}
-
-.github-fork-ribbon-wrapper.left {
-  left: 0;
-}
-
-.github-fork-ribbon-wrapper.right {
-  right: 0;
-}
-
-.github-fork-ribbon-wrapper.left-bottom {
-  position: fixed;
-  top: inherit;
-  bottom: 0;
-  left: 0;
-}
-
-.github-fork-ribbon-wrapper.right-bottom {
-  position: fixed;
-  top: inherit;
-  bottom: 0;
-  right: 0;
-}
-
-.github-fork-ribbon-wrapper.right .github-fork-ribbon {
-  top: 42px;
-  right: -43px;
-
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.github-fork-ribbon-wrapper.left .github-fork-ribbon {
-  top: 42px;
-  left: -43px;
-
-  -webkit-transform: rotate(-45deg);
-  -moz-transform: rotate(-45deg);
-  -ms-transform: rotate(-45deg);
-  -o-transform: rotate(-45deg);
-  transform: rotate(-45deg);
-}
-
-
-.github-fork-ribbon-wrapper.left-bottom .github-fork-ribbon {
-  top: 80px;
-  left: -43px;
-
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.github-fork-ribbon-wrapper.right-bottom .github-fork-ribbon {
-  top: 80px;
-  right: -43px;
-
-  -webkit-transform: rotate(-45deg);
-  -moz-transform: rotate(-45deg);
-  -ms-transform: rotate(-45deg);
-  -o-transform: rotate(-45deg);
-  transform: rotate(-45deg);
-}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/ie.css
----------------------------------------------------------------------
diff --git a/content/css/ie.css b/content/css/ie.css
deleted file mode 100644
index 3491050..0000000
--- a/content/css/ie.css
+++ /dev/null
@@ -1,16 +0,0 @@
-#container{
-	background-image:none;
-	filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='style/bg_container.png', sizingMethod='scale');
-}
-
-#navigation h5{
-	background-image:none;
-	filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='style/menuknop.png', sizingMethod='scale');
-}
-#navigation, #contentbody {
-	position:relative;
-	z-index : 1;
-}
-#logo {
-	top : 0px;
-}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/logo.png
----------------------------------------------------------------------
diff --git a/content/css/logo.png b/content/css/logo.png
deleted file mode 100644
index 4ea9759..0000000
Binary files a/content/css/logo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/menuknop.png
----------------------------------------------------------------------
diff --git a/content/css/menuknop.png b/content/css/menuknop.png
deleted file mode 100644
index af0003b..0000000
Binary files a/content/css/menuknop.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/screen.css
----------------------------------------------------------------------
diff --git a/content/css/screen.css b/content/css/screen.css
deleted file mode 100644
index 84147f3..0000000
--- a/content/css/screen.css
+++ /dev/null
@@ -1,281 +0,0 @@
-html{
-    height:100%;
-}
-
-body{
-    background:#787878 url('background.gif');
-    margin:0px;
-    padding:0px;
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    font-size: 76%;
-    color:#4a4a4a;
-    height:100%;
-}   
-
-a, a:visited {
-    text-decoration : none;
-    color : #eb5a0a;
-}
-a:hover {
-    text-decoration : underline;
-}
-
-/* Containers */
-#container{
-    background:url('bg_container.png');
-    /* De aloude <ie7 fix */    
-    /* filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='bg_container.png', sizingMethod='scale'); */
-    width:927px;
-    min-height:100%;
-    margin-left:auto;
-    margin-right:auto;
-    padding-left:28px;
-}
-
-#header{
-    background:#e8590a url('logo.png');
-    width:899px;
-    height:108px;
-}
-
-#content{
-    width:899px;
-    height:auto;
-    overflow: auto; /* keeps footer inside */
-}
-
-p, table, h1, h2, h3, h4, h5, h6, h7, div.code {
-    padding-left:25px;
-    padding-right : 1em;
-}
-
-#navigation {
-    background:#ffffff url('bg_menu.png') no-repeat 0px -2px;
-    width:172px;
-    min-height:200px;
-    height:auto;
-    float:left;
-    padding-right:50px;
-    padding-top:20px;
-    padding-left : 0px;
-    overflow : hidden;
-    text-align:right;
-}
-
-#navigation h5{
-    color:#eb5a0a;
-    font-weight:bold;
-    display:block;
-    background:transparent url('menuknop.png') no-repeat left top;
-    overflow : hidden;
-    vertical-align:baseline;
-    white-space : nowrap;
-    width:120px;
-    height:26px;
-    padding-right:24px;
-    padding-left : 0px;
-    font-size:1.2em;
-    margin-top:1em;
-    margin-bottom:0px;
-    float:right;
-}
-
-#navigation ul{
-    text-align:right;
-    display:block;
-    float:right;
-    margin:0px;
-    padding-right:24px;
-    list-style:none;
-    line-height:1.5em;
-    font-weight:bold;
-}
-
-#navigation a{
-    text-decoration:none;
-    color:#4a4a4a;
-}
-
-
-#contentbody{
-    background:#ffffff;
-    width:668px;
-    padding-top:20px;
-    height:auto;
-    float:left
-}
-
-h1, h2, .blogHeading {
-    color:#eb5a0a;
-    font-weight:bold;
-    font-size:1.2em;
-    background:#ffffff;
-    height:1.5em;
-    display:block;
-    text-decoration : none;
-}
-
-h1 {
-    background:#ffffff url('wicket.png') no-repeat left bottom;
-    min-height : 20px;
-    height : 20px;
-}
-
-.blogSurtitle, a.blogDate {
-    color:#4a4a4a;
-    font-size : 90%;
-}
-a.blogDate {
-    padding-left:25px;
-}
-.endsection {
-    display : none;
-}
-
-#logo span, #incubator span {
-    display : none;
-}
-
-#logo {
-    background: #ffffff url('logo.png') no-repeat left bottom;
-    height : 108px;
-    width : 300px;
-    position : absolute;
-    /*top : -9px;*/
-    margin-top : 0px;
-}
-
-#incubator {
-    display : none;
-    background: #ffffff url('nowincubating.png') no-repeat left bottom;
-    height : 97px;
-    width : 139px;
-    padding-top : 4em;
-}
-
-#footer{
-    background:#ffffff url('footer.png') no-repeat bottom left;
-    width:699px;
-    margin: 20px 0;
-	padding-left : 200px;
-}
-
-#clearer{
-    clear:both;
-    height:1px;
-}
-
-#footer span{
-    font-size:90%;
-}
-
-.blogSurtitle img, .rendericon {
-    display : none;
-}
-
-div.code {
-    margin-right : 25px;
-    margin-left : 25px;
-    padding-left : 25px;
-    padding-right : 25px;
-    border : thin solid black;
-}
-.confluenceTable {
-    width : 100%;
-}
-
-.confluenceTable div.code {
-    margin-right : 0;
-    margin-left : 0;
-    padding-left : 0;
-    padding-right : 0;
-    border : thin solid black;
-}
-.confluenceTd {
-    vertical-align : top;
-}
-
-pre, code {
-    font-family: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-span.code-keyword {
-    font-weight : bold;
-}
-span.code-tag {
-    font-weight : bold;
-}
-
-span sup {
-    display : none;
-}
-
-/* Windows Lucida font fix */
-#navigation ul, strong, em, h1, h2, h3, h4, h5, h6 {
-    font-family: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-div.highlight {
-	border : 1px solid #DDD;
-	margin-left : 25px;
-	padding : 0 10px;
-}
-.highlight .hll { background-color: #ffffcc }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #bb8844 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #999999 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #bb8844 } /* Literal.String.Backtick */
-.highlight .sc { color: #bb8844 } /* Literal.String.Char */
-.highlight .sd { color: #bb8844 } /* Literal.String.Doc */
-.highlight .s2 { color: #bb8844 } /* Literal.String.Double */
-.highlight .se { color: #bb8844 } /* Literal.String.Escape */
-.highlight .sh { color: #bb8844 } /* Literal.String.Heredoc */
-.highlight .si { color: #bb8844 } /* Literal.String.Interpol */
-.highlight .sx { color: #bb8844 } /* Literal.String.Other */
-.highlight .sr { color: #808000 } /* Literal.String.Regex */
-.highlight .s1 { color: #bb8844 } /* Literal.String.Single */
-.highlight .ss { color: #bb8844 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
new file mode 100644
index 0000000..1e8a48f
--- /dev/null
+++ b/content/css/style.css
@@ -0,0 +1,936 @@
+@import url(../fonts/source-code-pro/stylesheet.css);
+@import url(../fonts/source-sans-pro/stylesheet.css);
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline; }
+
+*,
+*:after,
+*:before {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box; }
+
+::-moz-selection {
+  background: #232725;
+  color: #fff;
+  text-shadow: none; }
+
+::selection {
+  background: #232725;
+  color: #fff;
+  text-shadow: none; }
+
+html {
+  color: #3f4542;
+  font: 300 15px "Source Sans Pro", sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-rendering: auto;
+  -webkit-text-size-adjust: 100%; }
+
+body {
+  line-height: 1.5em; }
+
+h1, h2, legend, h3, h4, h5, h6 {
+  font-family: "Source Sans Pro";
+  font-weight: 400;
+  line-height: 1.5em;
+  margin: 0 0 0.25em 0; }
+
+h1 {
+  font-size: 2rem; }
+
+h2,
+legend {
+  font-size: 1.5rem; }
+
+h3 {
+  font-size: 1.3rem; }
+
+h4 {
+  font-size: 1.2rem; }
+
+h5 {
+  font-size: 1.1rem; }
+
+h6 {
+  font-size: 1rem; }
+
+p {
+  margin-bottom: 1rem; }
+  p.is-lead {
+    font-size: 1.125rem; }
+
+a {
+  color: #FF9925;
+  cursor: pointer;
+  text-decoration: none; }
+  a:hover {
+    color: #ffb158; }
+
+small {
+  color: #8d9994;
+  font-size: 0.875rem; }
+
+em {
+  font-style: italic; }
+
+strong {
+  font-weight: bold; }
+
+code, pre {
+  font-family: 'courier new', monospace; }
+
+pre {
+  overflow-x: auto; }
+
+abbr {
+  border-bottom: 1px dotted #8d9994; }
+
+del {
+  text-decoration: line-through; }
+
+mark {
+  background-color: #ffffb3; }
+
+hr {
+  background-color: transparent;
+  border: solid #ccd6d2;
+  border-width: 1px 0 0;
+  clear: both;
+  margin: 2.5rem 1rem; }
+
+ul, ol {
+  margin: 0 0 1rem 1.5rem; }
+
+ul {
+  list-style: disc; }
+
+ol {
+  list-style: decimal; }
+
+dl {
+  margin-bottom: 1rem; }
+  dl dt {
+    font-weight: bold; }
+  dl dd {
+    margin-left: 1rem; }
+  dl.advanced:before, dl.advanced:after {
+    content: "";
+    display: table; }
+  dl.advanced:after {
+    clear: both; }
+  dl.advanced dt {
+    float: left;
+    width: 31.25%;
+    margin-left: 0%;
+    margin-right: 2.08333%; }
+  dl.advanced dd {
+    float: left;
+    width: 66.66667%;
+    margin-left: 0%;
+    margin-right: 0%; }
+
+.l-full {
+  width: 100%; }
+  @media (min-width: 590px) {
+    .l-full {
+      float: left;
+      width: 95.83333%;
+      margin-left: 2.08333%;
+      margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-two-third {
+    float: left;
+    width: 62.5%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-half {
+    float: left;
+    width: 45.83333%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-one-quarter {
+    float: left;
+    width: 20.83333%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-one-eigth {
+    float: left;
+    width: 8.33333%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-one-sixth {
+    float: left;
+    width: 12.5%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+@media (min-width: 590px) {
+  .l-one-third {
+    float: left;
+    width: 29.16667%;
+    margin-left: 2.08333%;
+    margin-right: 2.08333%; } }
+
+.l-grid:before, .l-grid:after {
+  content: "";
+  display: table; }
+.l-grid:after {
+  clear: both; }
+.l-grid li {
+  float: left;
+  width: 29.16667%;
+  margin-left: 2.08333%;
+  margin-right: 2.08333%; }
+
+.l-first {
+  clear: left; }
+
+.l-container {
+  margin: auto;
+  max-width: 80rem;
+  padding: 1rem; }
+  .l-container:before, .l-container:after {
+    content: "";
+    display: table; }
+  .l-container:after {
+    clear: both; }
+  @media (min-width: 769px) {
+    .l-container {
+      padding: 2rem; } }
+
+.is-hidden {
+  display: none !important; }
+
+.is-hidden, .is-invisible {
+  visibility: hidden !important; }
+
+.is-active, .is-visible {
+  display: block; }
+
+@media (min-width: 590px) {
+  .left {
+    float: left; } }
+
+@media (min-width: 590px) {
+  .right {
+    float: right; } }
+
+.text-left {
+  text-align: left; }
+
+.text-right {
+  text-align: right; }
+
+.text-center {
+  text-align: center; }
+
+.nowrap {
+  white-space: nowrap; }
+
+img.desaturated {
+  -webkit-filter: grayscale(100%);
+  -moz-filter: grayscale(100%);
+  filter: grayscale(100%); }
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0; }
+
+.button,
+input[type=submit],
+button, .button--neutral,
+input[type=submit].button--neutral,
+button.button--neutral, .button--success,
+input[type=submit].button--success,
+button.button--success, .button--alert,
+input[type=submit].button--alert,
+button.button--alert {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  border: 0;
+  border-radius: 0.125rem;
+  cursor: pointer;
+  display: inline-block;
+  font-family: "Source Sans Pro", sans-serif;
+  font-size: 1rem;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-weight: bold;
+  line-height: 1.5em;
+  margin: 0 0 0.25rem 0;
+  padding: 0.5rem 0.75rem;
+  text-decoration: none;
+  vertical-align: bottom; }
+  .button:focus,
+  input[type=submit]:focus,
+  button:focus, .button--neutral:focus, .button--success:focus, .button--alert:focus {
+    outline: 0; }
+
+.button,
+input[type=submit],
+button {
+  background: #FF9925;
+  color: #fff; }
+  .button:hover,
+  input[type=submit]:hover,
+  button:hover {
+    background: #ffb158;
+    color: #fff; }
+  .button:active, .button:focus,
+  input[type=submit]:active,
+  input[type=submit]:focus,
+  button:active,
+  button:focus {
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2); }
+
+.button--neutral,
+input[type=submit].button--neutral,
+button.button--neutral {
+  background: #ccd6d2;
+  color: #3f4542; }
+  .button--neutral:hover,
+  input[type=submit].button--neutral:hover,
+  button.button--neutral:hover {
+    background: #8d9994;
+    color: #3f4542; }
+  .button--neutral:active, .button--neutral:focus,
+  input[type=submit].button--neutral:active,
+  input[type=submit].button--neutral:focus,
+  button.button--neutral:active,
+  button.button--neutral:focus {
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2); }
+
+.button--success,
+input[type=submit].button--success,
+button.button--success {
+  background-color: #39b924;
+  color: #fff; }
+  .button--success:hover,
+  input[type=submit].button--success:hover,
+  button.button--success:hover {
+    background-color: #249c11;
+    color: #fff; }
+  .button--success:active, .button--success:focus,
+  input[type=submit].button--success:active,
+  input[type=submit].button--success:focus,
+  button.button--success:active,
+  button.button--success:focus {
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2); }
+
+.button--alert,
+input[type=submit].button--alert,
+button.button--alert {
+  background-color: #f3490d;
+  color: #fff; }
+  .button--alert:hover,
+  input[type=submit].button--alert:hover,
+  button.button--alert:hover {
+    background-color: #d33e09;
+    color: #fff; }
+  .button--alert:active, .button--alert:focus,
+  input[type=submit].button--alert:active,
+  input[type=submit].button--alert:focus,
+  button.button--alert:active,
+  button.button--alert:focus {
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2); }
+
+@media print {
+  * {
+    background: transparent !important;
+    color: black !important;
+    text-shadow: none !important;
+    filter: none !important;
+    -ms-filter: none !important; }
+
+  /* Black prints faster: h5bp.com/s */
+  a, a:visited {
+    text-decoration: underline; }
+
+  a[href]:after {
+    content: " (" attr(href) ")"; }
+
+  abbr[title]:after {
+    content: " (" attr(title) ")"; }
+
+  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after {
+    content: ""; }
+
+  /* Don't show links for images, or javascript/internal links */
+  pre, blockquote {
+    page-break-inside: avoid; }
+
+  thead {
+    display: table-header-group; }
+
+  /* h5bp.com/t */
+  tr, img {
+    page-break-inside: avoid; }
+
+  img {
+    max-width: 100% !important; }
+
+  @page {
+    margin: 2cm; }
+  p, h2, h3 {
+    orphans: 3;
+    widows: 3; }
+
+  h2, h3 {
+    page-break-after: avoid; } }
+.highlight {
+  background: #ffffff; }
+
+.highlight .c {
+  color: #999988;
+  font-style: italic; }
+
+/* Comment */
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2; }
+
+/* Error */
+.highlight .k {
+  font-weight: bold; }
+
+/* Keyword */
+.highlight .o {
+  font-weight: bold; }
+
+/* Operator */
+.highlight .cm {
+  color: #999988;
+  font-style: italic; }
+
+/* Comment.Multiline */
+.highlight .cp {
+  color: #999999;
+  font-weight: bold; }
+
+/* Comment.Preproc */
+.highlight .c1 {
+  color: #999988;
+  font-style: italic; }
+
+/* Comment.Single */
+.highlight .cs {
+  color: #999999;
+  font-weight: bold;
+  font-style: italic; }
+
+/* Comment.Special */
+.highlight .gd {
+  color: #000000;
+  background-color: #ffdddd; }
+
+/* Generic.Deleted */
+.highlight .gd .x {
+  color: #000000;
+  background-color: #ffaaaa; }
+
+/* Generic.Deleted.Specific */
+.highlight .ge {
+  font-style: italic; }
+
+/* Generic.Emph */
+.highlight .gr {
+  color: #aa0000; }
+
+/* Generic.Error */
+.highlight .gh {
+  color: #999999; }
+
+/* Generic.Heading */
+.highlight .gi {
+  color: #000000;
+  background-color: #ddffdd; }
+
+/* Generic.Inserted */
+.highlight .gi .x {
+  color: #000000;
+  background-color: #aaffaa; }
+
+/* Generic.Inserted.Specific */
+.highlight .go {
+  color: #888888; }
+
+/* Generic.Output */
+.highlight .gp {
+  color: #555555; }
+
+/* Generic.Prompt */
+.highlight .gs {
+  font-weight: bold; }
+
+/* Generic.Strong */
+.highlight .gu {
+  color: #aaaaaa; }
+
+/* Generic.Subheading */
+.highlight .gt {
+  color: #aa0000; }
+
+/* Generic.Traceback */
+.highlight .kc {
+  font-weight: bold; }
+
+/* Keyword.Constant */
+.highlight .kd {
+  font-weight: bold; }
+
+/* Keyword.Declaration */
+.highlight .kp {
+  font-weight: bold; }
+
+/* Keyword.Pseudo */
+.highlight .kr {
+  font-weight: bold; }
+
+/* Keyword.Reserved */
+.highlight .kt {
+  color: #445588;
+  font-weight: bold; }
+
+/* Keyword.Type */
+.highlight .m {
+  color: #009999; }
+
+/* Literal.Number */
+.highlight .s {
+  color: #d14; }
+
+/* Literal.String */
+.highlight .na {
+  color: #008080; }
+
+/* Name.Attribute */
+.highlight .nb {
+  color: #0086B3; }
+
+/* Name.Builtin */
+.highlight .nc {
+  color: #445588;
+  font-weight: bold; }
+
+/* Name.Class */
+.highlight .no {
+  color: #008080; }
+
+/* Name.Constant */
+.highlight .ni {
+  color: #800080; }
+
+/* Name.Entity */
+.highlight .ne {
+  color: #990000;
+  font-weight: bold; }
+
+/* Name.Exception */
+.highlight .nf {
+  color: #990000;
+  font-weight: bold; }
+
+/* Name.Function */
+.highlight .nn {
+  color: #555555; }
+
+/* Name.Namespace */
+.highlight .nt {
+  color: #000080; }
+
+/* Name.Tag */
+.highlight .nv {
+  color: #008080; }
+
+/* Name.Variable */
+.highlight .ow {
+  font-weight: bold; }
+
+/* Operator.Word */
+.highlight .w {
+  color: #bbbbbb; }
+
+/* Text.Whitespace */
+.highlight .mf {
+  color: #009999; }
+
+/* Literal.Number.Float */
+.highlight .mh {
+  color: #009999; }
+
+/* Literal.Number.Hex */
+.highlight .mi {
+  color: #009999; }
+
+/* Literal.Number.Integer */
+.highlight .mo {
+  color: #009999; }
+
+/* Literal.Number.Oct */
+.highlight .sb {
+  color: #d14; }
+
+/* Literal.String.Backtick */
+.highlight .sc {
+  color: #d14; }
+
+/* Literal.String.Char */
+.highlight .sd {
+  color: #d14; }
+
+/* Literal.String.Doc */
+.highlight .s2 {
+  color: #d14; }
+
+/* Literal.String.Double */
+.highlight .se {
+  color: #d14; }
+
+/* Literal.String.Escape */
+.highlight .sh {
+  color: #d14; }
+
+/* Literal.String.Heredoc */
+.highlight .si {
+  color: #d14; }
+
+/* Literal.String.Interpol */
+.highlight .sx {
+  color: #d14; }
+
+/* Literal.String.Other */
+.highlight .sr {
+  color: #009926; }
+
+/* Literal.String.Regex */
+.highlight .s1 {
+  color: #d14; }
+
+/* Literal.String.Single */
+.highlight .ss {
+  color: #990073; }
+
+/* Literal.String.Symbol */
+.highlight .bp {
+  color: #999999; }
+
+/* Name.Builtin.Pseudo */
+.highlight .vc {
+  color: #008080; }
+
+/* Name.Variable.Class */
+.highlight .vg {
+  color: #008080; }
+
+/* Name.Variable.Global */
+.highlight .vi {
+  color: #008080; }
+
+/* Name.Variable.Instance */
+.highlight .il {
+  color: #009999; }
+
+/* Literal.Number.Integer.Long */
+.logo {
+  text-align: center; }
+  @media (min-width: 769px) {
+    .logo {
+      display: inline-block;
+      float: left;
+      margin: 0;
+      margin-left: 2.08333%; } }
+  .logo img {
+    display: inline-block;
+    width: 240px; }
+
+.jumbotron.header {
+  /*        background: radial-gradient(ellipse closest-side, rgba(0,0,0,0), rgba(0,0,0,0.6)), url('../img/background-1.jpg');*/
+  background-color: #111;
+  background-image: url("../img/background-2.jpg");
+  background-repeat: no-repeat;
+  background-position: center 25%;
+  background-size: cover;
+  box-shadow: inset 0 0 40px black; }
+@media (min-width: 769px) {
+  .jumbotron .mainmenu {
+    padding-top: 1rem;
+    margin-bottom: 7rem; } }
+.jumbotron .jumbotron-mission {
+  font-size: 1.313rem;
+  font-weight: 400;
+  line-height: 2;
+  margin-top: 2rem;
+  margin-bottom: 2rem;
+  text-align: center;
+  text-transform: uppercase;
+  float: left;
+  width: 91.66667%;
+  margin-left: 4.16667%;
+  margin-right: 4.16667%; }
+  @media (min-width: 590px) {
+    .jumbotron .jumbotron-mission {
+      float: left;
+      width: 75%;
+      margin-left: 12.5%;
+      margin-right: 12.5%;
+      margin-top: 2rem;
+      margin-bottom: 3rem; } }
+  @media (min-width: 769px) {
+    .jumbotron .jumbotron-mission {
+      float: left;
+      width: 50%;
+      margin-left: 25%;
+      margin-right: 25%; } }
+.jumbotron .jumbotron-download {
+  margin: 2rem auto;
+  text-align: center;
+  text-transform: uppercase; }
+.jumbotron .jumbotron-logo {
+  margin-top: 2rem;
+  margin-bottom: 2rem; }
+  @media (min-width: 769px) {
+    .jumbotron .jumbotron-logo {
+      display: block;
+      float: none; } }
+  .jumbotron .jumbotron-logo img {
+    display: block;
+    width: 50%;
+    min-width: 320px;
+    margin: 0 auto; }
+
+nav.mainmenu {
+  display: block;
+  margin: 0 auto 2rem auto;
+  text-align: center; }
+  nav.mainmenu ul {
+    list-style: none; }
+  nav.mainmenu li {
+    display: inline-block;
+    font-size: 12px;
+    text-transform: uppercase; }
+    nav.mainmenu li.active {
+      border-bottom: 2px solid white; }
+  nav.mainmenu li + li {
+    margin-left: 2.08333%; }
+  nav.mainmenu a, nav.mainmenu a:active, nav.mainmenu a:hover {
+    border: none;
+    color: #fff;
+    font-weight: 400;
+    text-decoration: none; }
+
+.toc ul {
+  list-style: none; }
+.toc > ul {
+  margin-left: 0; }
+.toc > ul > li + li {
+  margin-top: 1rem; }
+
+.builtwithwicket {
+  background-color: #eee;
+  margin-left: -1rem;
+  margin-right: -1rem;
+  padding-bottom: 2rem;
+  padding-left: 1rem;
+  padding-right: 1rem; }
+  .builtwithwicket .slick-prev::before,
+  .builtwithwicket .slick-next::before {
+    color: #FF9925; }
+
+.builtwithwicket + hr {
+  display: none; }
+
+.builtwithwicket-post {
+  padding: 1rem 1rem 0 1rem; }
+
+.builtwithwicket-screenshot {
+  margin: 0 auto;
+  max-height: 20rem;
+  min-height: 15rem;
+  max-width: 100%;
+  min-width: 50%;
+  padding-bottom: 1rem; }
+
+div.quickstart-wizard {
+  background-color: #FF9925;
+  border-radius: 3px;
+  color: #ffffff;
+  line-height: 2em;
+  padding: 1rem 2rem 2rem 2rem; }
+  div.quickstart-wizard label {
+    display: block;
+    font-weight: bold;
+    margin-top: 0.5rem; }
+  div.quickstart-wizard button,
+  div.quickstart-wizard input,
+  div.quickstart-wizard select,
+  div.quickstart-wizard textarea {
+    display: block;
+    width: 100%;
+    border: none;
+    border-radius: 3px;
+    padding: 0.5rem;
+    color: #606060;
+    height: 2rem; }
+  div.quickstart-wizard textarea {
+    height: 5rem; }
+  div.quickstart-wizard button {
+    background-color: #E68A00;
+    color: white;
+    height: 3em;
+    margin-top: 1em;
+    font-size: 1em;
+    font-weight: 200; }
+
+.quickstart ol {
+  margin-left: 0;
+  padding-left: 0;
+  counter-reset: item; }
+.quickstart ol > li {
+  margin-left: 2.5rem;
+  padding-left: 0;
+  counter-increment: item;
+  list-style: none inside;
+  margin-bottom: 10px; }
+.quickstart ol > li:before {
+  background: #FF9925;
+  border-radius: 50%;
+  color: #fff;
+  content: counter(item);
+  display: inline-block;
+  height: 2rem;
+  margin-left: -2.5rem;
+  margin-right: 0.5rem;
+  padding-top: 0.3333rem;
+  text-align: center;
+  vertical-align: baseline;
+  font-weight: bold;
+  width: 2rem; }
+
+code, pre, code > span, pre > span {
+  font-family: 'Source Code Pro', 'courier new', monospace;
+  font-size: 0.875rem; }
+
+a {
+  border-color: #FF9925;
+  border-style: none none dotted none;
+  border-width: 0 0 1px 0;
+  cursor: pointer;
+  font-weight: 400;
+  text-decoration: none; }
+  a:hover {
+    color: #ffb158; }
+
+h1 a, h2 a, h3 a {
+  border: none; }
+
+div.header {
+  background-image: url("../img/background-2.jpg");
+  background-repeat: no-repeat;
+  background-position: center 25%;
+  background-size: cover;
+  background-color: #111;
+  color: #fff;
+  display: block;
+  position: relative;
+  width: 100%; }
+
+.default nav.mainmenu {
+  margin: 0; }
+  @media (min-width: 769px) {
+    .default nav.mainmenu {
+      display: inline-block;
+      margin: 0;
+      width: 62.5%;
+      float: right; } }
+.default a, .default a:hover, .default a:active, .default a:visited {
+  border: none; }
+
+.preamble {
+  font-weight: 300;
+  line-height: 2;
+  text-align: center; }
+  .preamble h1 {
+    font-weight: 300;
+    padding-top: 2rem; }
+  .preamble h2 {
+    color: #FF9925;
+    font-weight: 300; }
+  .preamble h1 + *,
+  .preamble h2 + *,
+  .preamble img + * {
+    padding-top: 2rem; }
+  .preamble h1:last-child,
+  .preamble h2:last-child,
+  .preamble img:last-child {
+    margin-bottom: 2rem; }
+  .preamble p {
+    font-size: 1.125rem;
+    text-align: left; }
+
+.index .preamble {
+  margin-bottom: 2rem; }
+  .index .preamble p {
+    text-align: center; }
+
+.news ul {
+  list-style: none;
+  margin-left: 0;
+  padding-left: 0; }
+.news li {
+  display: block;
+  margin-left: 0;
+  margin-bottom: 2rem;
+  padding-left: 0; }
+
+.l-full hr,
+.l-half hr,
+.l-one-third hr,
+.l-one-sixth hr,
+.l-one-quarter hr,
+.l-one-eigth hr,
+.l-two-third hr {
+  margin-left: 0;
+  margin-right: 0; }
+
+pre {
+  margin: 1rem 0; }
+
+article + article {
+  border-top: 1px solid #ccd6d2;
+  clear: both;
+  margin-top: 2rem;
+  padding-top: 2rem; }
+
+.button-bar {
+  display: -webkit-flex;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 2rem;
+  width: 100%; }
+  .button-bar .button {
+    -webkit-flex: 1;
+    flex: 1;
+    padding: 1rem;
+    text-align: center; }
+    .button-bar .button + .button {
+      margin-left: 0.5rem; }
+    .button-bar .button i {
+      font-size: 3rem; }

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/css/wicket.png
----------------------------------------------------------------------
diff --git a/content/css/wicket.png b/content/css/wicket.png
deleted file mode 100644
index 0f0fc45..0000000
Binary files a/content/css/wicket.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/doap.rdf
----------------------------------------------------------------------
diff --git a/content/doap.rdf b/content/doap.rdf
index 1562cb1..2377f83 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -10,7 +10,7 @@
   =======================================================================
 -->
 	<Project rdf:about="http://wicket.apache.org/">
-		<created>2010-06-21</created>
+		<created>2004-04-01</created>
 		<license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
 		<name>Apache Wicket</name>
 		<homepage rdf:resource="http://wicket.apache.org"/>
@@ -30,10 +30,11 @@
 			</Version>
 		</release>
 		<repository>
-			<SVNRepository>
-				<location rdf:resource="http://svn.apache.org/repos/asf/wicket/trunk"/>
-				<browse rdf:resource="http://svn.apache.org/viewvc/wicket/trunk"/>
-			</SVNRepository>
+            <repository>
+                <GITRepository>
+                    <location rdf:resource="http://git-wip-us.apache.org/repos/asf?p=wicket.git"/>
+                    <browse rdf:resource="http://git-wip-us.apache.org/repos/asf?p=wicket.git"/>
+                </GITRepository>
 		</repository>
 	</Project>
 </rdf:RDF>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/dtds.data/index.html
----------------------------------------------------------------------
diff --git a/content/dtds.data/index.html b/content/dtds.data/index.html
index deb96b7..5b15b07 100644
--- a/content/dtds.data/index.html
+++ b/content/dtds.data/index.html
@@ -1,213 +1,75 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Apache Wicket DTDs</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket DTDs | 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>Apache Wicket DTDs</h1>
-			<p>The following are the Document Type Definitions and XML Schema Definitions which you can use
-for Wicket 1.3.x, 1.4.x and 1.5.x respectively.</p>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /dtds.data -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /dtds.data -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /dtds.data -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /dtds.data -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /dtds.data -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /dtds.data -->
+    	<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>Apache Wicket DTDs</h1>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>The following are the Document Type Definitions and XML Schema Definitions which you can use
+for Wicket 1.3.x, 1.4.x and 1.5.x respectively.</p>
 <p>These definitions are not used by Wicket for its internal working but you can use them in your
 HTML/XML editor to simplify the development of your pages/panels markup.</p>
-
 <ul>
   <li><a href="wicket-xhtml1.3-strict.dtd">Wicket 1.3 DTD</a></li>
   <li><a href="wicket-xhtml1.4-strict.dtd">Wicket 1.4 DTD</a></li>
   <li><a href="http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=blob_plain;f=wicket-core/src/main/resources/META-INF/wicket-1.5.xsd;hb=master">Wicket 1.5 XSD</a></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/230d6865/content/favicon.ico
----------------------------------------------------------------------
diff --git a/content/favicon.ico b/content/favicon.ico
index d54f35d..77e0c70 100644
Binary files a/content/favicon.ico and b/content/favicon.ico differ

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/fonts/league-gothic/LeagueGothic-CondensedItalic-webfont.eot
----------------------------------------------------------------------
diff --git a/content/fonts/league-gothic/LeagueGothic-CondensedItalic-webfont.eot b/content/fonts/league-gothic/LeagueGothic-CondensedItalic-webfont.eot
new file mode 100755
index 0000000..ebd022d
Binary files /dev/null and b/content/fonts/league-gothic/LeagueGothic-CondensedItalic-webfont.eot differ