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 2017/11/02 11:33:24 UTC
[20/26] wicket git commit: First set of page migrated
First set of page migrated
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9c954da6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9c954da6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9c954da6
Branch: refs/heads/WICKET-6490
Commit: 9c954da654cde589cdfb4af6032c5a08f2938497
Parents: f7688bf
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon Oct 30 16:51:26 2017 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Mon Oct 30 16:51:26 2017 +0100
----------------------------------------------------------------------
wicket-examples/replace.sh | 2 +-
.../java/org/apache/wicket/examples/ajax/prototype/Index.html | 3 ++-
.../java/org/apache/wicket/examples/asemail/MailTemplate.html | 3 ++-
.../java/org/apache/wicket/examples/authentication1/Home.html | 3 ++-
.../java/org/apache/wicket/examples/authentication1/SignIn.html | 3 ++-
.../org/apache/wicket/examples/authentication1/SignOut.html | 3 ++-
.../java/org/apache/wicket/examples/authentication2/Home.html | 3 ++-
.../org/apache/wicket/examples/authentication2/SignIn2.html | 3 ++-
.../org/apache/wicket/examples/authentication2/SignOut.html | 3 ++-
.../org/apache/wicket/examples/authentication3/BasePage.html | 3 ++-
.../apache/wicket/examples/authentication3/MySignInPage.html | 3 ++-
.../org/apache/wicket/examples/authentication3/SignOut.html | 3 ++-
.../java/org/apache/wicket/examples/authorization/BasePage.html | 3 ++-
.../main/java/org/apache/wicket/examples/breadcrumb/Index.html | 3 ++-
.../wicket/examples/compref/BookmarkablePageLinkPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/BorderPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/ButtonPage.html | 3 ++-
.../wicket/examples/compref/CheckBoxMultipleChoicePage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/CheckBoxPage.html | 3 ++-
.../apache/wicket/examples/compref/CheckBoxSelectorPage.html | 5 +++--
.../java/org/apache/wicket/examples/compref/CheckGroupPage.html | 3 ++-
.../org/apache/wicket/examples/compref/CheckGroupPage2.html | 3 ++-
.../org/apache/wicket/examples/compref/DropDownChoicePage.html | 3 ++-
.../org/apache/wicket/examples/compref/ExternalLinkPage.html | 3 ++-
.../main/java/org/apache/wicket/examples/compref/FormPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/FragmentPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/IncludePage.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/compref/Index.html | 3 ++-
.../main/java/org/apache/wicket/examples/compref/LabelPage.html | 3 ++-
.../main/java/org/apache/wicket/examples/compref/LinkPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/ListChoicePage.html | 3 ++-
.../apache/wicket/examples/compref/ListMultipleChoicePage.html | 3 ++-
.../org/apache/wicket/examples/compref/MultiLineLabelPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/PalettePage.html | 3 ++-
.../main/java/org/apache/wicket/examples/compref/PanelPage.html | 3 ++-
.../org/apache/wicket/examples/compref/RadioChoicePage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/RadioGroupPage.html | 3 ++-
.../org/apache/wicket/examples/compref/RadioGroupPage2.html | 3 ++-
.../java/org/apache/wicket/examples/compref/SelectPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/SubmitLinkPage.html | 3 ++-
.../org/apache/wicket/examples/compref/TabbedPanelPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/TextAreaPage.html | 3 ++-
.../java/org/apache/wicket/examples/compref/TextFieldPage.html | 3 ++-
.../examples/customresourceloading/CustomLoadedTemplate.html | 3 ++-
.../org/apache/wicket/examples/customresourceloading/Index.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/echo/Echo.html | 3 ++-
.../main/java/org/apache/wicket/examples/encodings/Home.html | 3 ++-
.../java/org/apache/wicket/examples/forminput/FormInput.html | 3 ++-
.../main/java/org/apache/wicket/examples/frames/TopFrame.html | 3 ++-
.../java/org/apache/wicket/examples/guestbook/GuestBook.html | 3 ++-
.../main/java/org/apache/wicket/examples/guice/HomePage.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/hangman/Home.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/hangman/Lose.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/hangman/Win.html | 3 ++-
.../org/apache/wicket/examples/hellobrowser/HelloBrowser.html | 3 ++-
.../java/org/apache/wicket/examples/helloworld/HelloWorld.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/images/Home.html | 3 ++-
.../java/org/apache/wicket/examples/kittenCaptcha/HomePage.html | 3 ++-
.../main/java/org/apache/wicket/examples/library/SignOut.html | 3 ++-
.../main/java/org/apache/wicket/examples/linkomatic/Home.html | 3 ++-
.../org/apache/wicket/examples/spring/common/web/BasePage.html | 5 +++--
.../main/java/org/apache/wicket/examples/stateless/Index.html | 5 +++--
.../java/org/apache/wicket/examples/stateless/StatefulPage.html | 5 +++--
.../org/apache/wicket/examples/stateless/StatelessPage.html | 5 +++--
.../org/apache/wicket/examples/stateless/StatelessPage1.html | 5 +++--
.../org/apache/wicket/examples/stateless/StatelessPage2.html | 5 +++--
.../org/apache/wicket/examples/stateless/StatelessPage3.html | 5 +++--
.../org/apache/wicket/examples/stockquote/StockQuotePage.html | 3 ++-
.../java/org/apache/wicket/examples/template/border/Page1.html | 3 ++-
.../java/org/apache/wicket/examples/template/border/Page2.html | 3 ++-
.../wicket/examples/template/pageinheritance/TemplatePage.html | 3 ++-
.../wicket/examples/unicodeconverter/UnicodeConverter.html | 3 ++-
.../main/java/org/apache/wicket/examples/upload/UploadPage.html | 3 ++-
.../java/org/apache/wicket/examples/velocity/DynamicPage.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/velocity/Home.html | 3 ++-
.../java/org/apache/wicket/examples/velocity/TemplatePage.html | 3 ++-
.../src/main/java/org/apache/wicket/examples/wizard/Index.html | 3 ++-
.../main/java/org/apache/wicket/examples/wizard/WizardPage.html | 3 ++-
.../org/apache/wicket/examples/requestmapper/LocalizedPage.html | 5 +++--
.../wicket/examples/requestmapper/RequestMapperHomePage.html | 5 +++--
.../examples/requestmapper/packageMount/PackageMountedPage.html | 5 +++--
.../webapp/WEB-INF/templates/AlternativePageFromWebContext.html | 3 ++-
.../examples/customresourceloading/PageFromWebContext.html | 3 ++-
.../src/test/java/org/apache/wicket/filtertest/HelloWorld.html | 3 ++-
84 files changed, 178 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/replace.sh
----------------------------------------------------------------------
diff --git a/wicket-examples/replace.sh b/wicket-examples/replace.sh
index 946046b..cdd352e 100644
--- a/wicket-examples/replace.sh
+++ b/wicket-examples/replace.sh
@@ -1,4 +1,4 @@
#!/bin/bash
grep -r -H -l --include=*.html "<span wicket:id=\"mainNavigation\"/>" . | while read line; do
- cat $line | sed -e 's/<span wicket:id=\"mainNavigation\"/>/<wicket:extend>/g' | sed -e 's/<\/body>/<\/body>\n<\/wicket:extend>/g' >> tmpfile ; mv tmpfile $line
+ cat $line | sed -e 's/<span wicket:id=\"mainNavigation\"\/>/<wicket:extend>/g' | sed -e 's/<\/body>/<\/wicket:extend>\n<\/body>/g' >> tmpfile ; mv tmpfile $line
done
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
index 1c0c99e..95f961f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>Counting link using Ajax: <a href="#" wicket:id="link">Click me!</a></p>
<!-- the wicket component is enclosed in a span tag with a separate markup ID attribute -->
@@ -13,5 +13,6 @@
<!-- updater only replaces the contents of the tags, not the tags itself. -->
<p>Link was clicked <span id="counter"><span wicket:id="counter">-100</span></span> times.</p>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
index 75761c6..8aaa9fb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div wicket:id="feedback"></div>
@@ -25,5 +25,6 @@
</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
index f1b35c6..aa910ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
@@ -4,9 +4,10 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Welcome!</h2>
<wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
index 89a713d..35a6d88 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id = "feedback"/>
<p>
@@ -22,5 +22,6 @@
</dd>
</dl>
</form>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
index 8ad4d4c..65bad73 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
@@ -4,8 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Goodbye!</h2>
<wicket:link><a href="Home.html">Home</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
index e2567b4..8430100 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
@@ -4,8 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Welcome!</h2>
<wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
index 196df83..2adc5be 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
@@ -4,10 +4,11 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
<i>Username and password are both "wicket"</i>
</p>
<span wicket:id="signInPanel"/>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
index 3867ad8..67a571f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
@@ -4,8 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Goodbye!</h2>
<wicket:link><a href="Home.html">Home</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
index d8821c4..0b14721 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
@@ -4,7 +4,8 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<wicket:child/>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
index 196df83..2adc5be 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
@@ -4,10 +4,11 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
<i>Username and password are both "wicket"</i>
</p>
<span wicket:id="signInPanel"/>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
index 97ff9ed..bff2a1c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
@@ -4,8 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Goodbye!</h2>
<wicket:link><a href="HomePage.html">Home</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
index d0fbf8f..a2c8bf7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
@@ -4,7 +4,8 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<wicket:child/>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
index 8515f6a..86057b9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div>
<span wicket:id="breadCrumbBar">bar</span>
@@ -15,5 +15,6 @@
<span wicket:id="panel">bar</span>
</div>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
index 0ec74e8..f7cceab 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.link.BookmarkablePageLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -24,5 +24,6 @@
<a wicket:id="pageLinkWithArgs">go to our bookmarkable page passing a message argument</a>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
index 567f910..1f0466f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.border.Border</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -30,5 +30,6 @@
</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
index 5218937..ab58a20 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.Button</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -37,5 +37,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
index b87586e..c00fddb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.CheckBoxMultipleChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -42,5 +42,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
index 5f3945c..dea2797 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.CheckBox</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -35,5 +35,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
index 9107f03..fae184a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -37,5 +37,6 @@
<input type="checkbox" wicket:id="looseSelector"/> select all
</form>
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
index b10bf3f..534bc58 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -48,5 +48,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
index 96137cc..bed89e4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -52,5 +52,6 @@
</form>
</p>
<span wicket:id="feedback">feedbackmessages will be put here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
index cbd0c19..d81569a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.DropDownChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -47,5 +47,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
index 7ae78ce..e9e6cf3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.link.ExternalLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -20,5 +20,6 @@
<a href="#" target="_new" wicket:id="externalLink2">this body will be replaced</a>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
index 796b0d6..0a71ad1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.Form</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -33,5 +33,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
index 1792300..7f81ce3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.panel.Fragment</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -17,6 +17,7 @@
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
<wicket:fragment wicket:id="fragmentid">
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/IncludePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/IncludePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/IncludePage.html
index 2805dfc..95ce4d0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/IncludePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/IncludePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.include.Include</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -25,5 +25,6 @@
</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
index d1d4dc2..9f1a4a0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>Component reference</h1>
@@ -77,5 +77,6 @@
</wicket:link>
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
index f2a3abe..83fba23 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.basic.Label</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -53,5 +53,6 @@
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
index 0719514..2808b9e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.link.Link</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -36,5 +36,6 @@
<input type="button" wicket:id="link3" value="this button is clicked n times" />
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
index f483918..e927c41 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.ListChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -37,5 +37,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
index f14f1d4..ed62852 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.ListMultipleChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -46,5 +46,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
index 2a2d05f..afa1445 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.basic.MultiLineLabel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -19,5 +19,6 @@
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
index 4f0b8ce..50c4ac7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
@@ -14,7 +14,7 @@
</style>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.extensions.markup.html.form.palette.Palette</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -32,5 +32,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
index 3cd922c..43545b3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.panel.Panel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -18,5 +18,6 @@
<div wicket:id="explainPanel">panel contents come here</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
index 23ae112..41fd6d2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.RadioChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -37,5 +37,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
index 799d77b..40bb146 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -47,5 +47,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
index 3457499..1d9fea4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -50,5 +50,6 @@
</form>
</p>
<span wicket:id="feedback">feedbackmessages will be put here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
index 88e6498..5b69e33 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>org.apache.wicket.extensions.markup.html.form.select.Select</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -52,5 +52,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
index 107a2cf..533b6d3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.SubmitLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -22,5 +22,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
index 76a57f4..bc23dd1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.tabs.TabbedPanel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -21,5 +21,6 @@
<div wicket:id="tabs" class="tabpanel">[tabbed panel will be here]</div>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
index bccf133..9f219ef 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.TextArea</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -34,5 +34,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
index cf65ab5..2e3329b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h1>wicket.markup.html.form.TextField</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
@@ -38,5 +38,6 @@
<span wicket:id="feedback">feedbackmessages will be put here</span>
</p>
<span wicket:id="explainPanel">panel contents come here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
index cb2519a..295476d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
This page was loaded by a component specific override. You can use that - with care - if you have
to implement custom loading strategies that are very local to the component. For instance, a custom
@@ -20,5 +20,6 @@
cache key. This functionality can be used to e.g. when you want to load templates from a database,
and you know that the actual templates can be different from request to request.
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
index 2f7800c..4479ff4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<ul>
<wicket:link>
<li>
@@ -21,5 +21,6 @@
<a href="#" wicket:id="customLoadingPageLink">Go to a page that which template is loaded by itself.</a>
</li>
</ul>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
index e47d53b..ad73c44 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<form wicket:id="form">
<input type="text" wicket:id="msgInput" value="" size="50" />
@@ -13,5 +13,6 @@
</form>
<span wicket:id="msg" id="msg">Message goes here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
index d86aca2..828f2ff 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
Http Header character set:
<script type="text/javascript">
@@ -19,5 +19,6 @@
<p>
Test: ���
</p>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
index c516b65..053ad59 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<form wicket:id="inputForm" class="inputForm">
<div>
<wicket:message key="use.locale">Use locale:</wicket:message>
@@ -82,5 +82,6 @@
<div id="feedbackPanel">
<span wicket:id="feedback"/>
</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
index 5c841fe..a7c5581 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
@@ -5,6 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
index 0be2bc5..606f5fa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<form wicket:id = "commentForm" id = "commentForm">
Add your comment here:
@@ -28,5 +28,6 @@
More comment text here.
</p>
</wicket:remove>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
index 32ef2ac..62a341d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
This page uses <a href="http://code.google.com/p/google-guice/">Google Guice</a>.
There is a service interface called <code>IMyService</code>, with an implementation POJO called <code>MyService</code>.
@@ -27,5 +27,6 @@
To configure your application for Guice injection, see the javadoc for <code>GuiceComponentInjector</code>.
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
index c0eb7f8..fa088ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>This software plays a game of hangman.
<br />
A word is chosen at random and displayed as a series of blanks.
@@ -12,5 +12,6 @@
You then have 5 opportunities to pick letters from the list of available letters.
</p>
<p><a wicket:id="start" id="start" href="#">Start Hangman</a></p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
index 186d28d..3b78e1e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
@@ -4,9 +4,10 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>Bad luck. You failed to guess that the word was <b><span wicket:id="currentWord">summer</span></b>.</p>
<p>Better luck next time!</p>
<p><a wicket:id="playAgain">Play again</a>.</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
index 3d939d2..5b02668 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
@@ -4,9 +4,10 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>Congratulations! You guessed that the word was <b><span wicket:id="currentWord">summer</span></b>
with <span wicket:id="guessesRemaining">3</span> remaining guesses.</p>
<p><a wicket:id="playAgain">Play again</a>.</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
index 2d9aad7..d3e57db 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
Hi there. We have been snooping around your browser, even doing a sneaky
@@ -18,5 +18,6 @@
<span wicket:id="clienttime">client time info here</span>
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
index 271d7b0..26e658f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
@@ -5,7 +5,8 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
index 32a658a..5a0593e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<img src = "Image1.gif"/>
<img wicket:id = "image2" src = "Image2.gif"/>
<img wicket:id = "image3"/>
@@ -24,5 +24,6 @@
<img wicket:id="image7"/>
</picture>
<img wicket:id="inline"/>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
index abacd1b..43aeb49 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
@@ -6,10 +6,11 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div style="font-family: helvetica" wicket:id="captcha"></div>
<p/>
<a wicket:id="checkKittens">Check kittens!</a>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
index 8ad4d4c..65bad73 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
@@ -4,8 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h2>Goodbye!</h2>
<wicket:link><a href="Home.html">Home</a></wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
index c0e435e..62ee8f2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
@@ -5,7 +5,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<!-- Example to demonstrate different kinds of linking supported -->
@@ -58,5 +58,6 @@
<span wicket:id="feedback" />
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
index b0dd3a9..dbd7acb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
@@ -21,12 +21,13 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<a href="#" wicket:id="home-link">Home Page</a>
<hr/>
<wicket:child/>
<br/><br/>
All this is discussed in more detail here:<br/>
<a href="http://cwiki.apache.org/WICKET/spring.html" target="_blank">Wicket Wiki Spring Page</a>
- </body>
+ </wicket:extend>
+</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
index 4239cc9..549fc94 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="linkToStatelessPage" href="#">go to another default stateless page</a>
@@ -22,5 +22,6 @@
<br/>
<br/>
<a wicket:id="invalidatesession" href="#">Invalidate the session</a>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
index d71cd1b..ce453c1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="indexLink" href="#">go to index</a>
@@ -33,5 +33,6 @@
<p>
<span wicket:id="feedback" />
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
index ce0166c..d4163d0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="indexLink" href="#">go to index</a>
@@ -27,5 +27,6 @@
<span wicket:id="feedback" />
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
index 20b1f9a..06fb4d3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="indexLink" href="#">go to index</a>
@@ -27,5 +27,6 @@
<span wicket:id="feedback" />
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
index 4c0f1c5..ad6fef5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="indexLink" href="#">go to index</a>
@@ -27,5 +27,6 @@
<span wicket:id="feedback" />
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
index 4c0f1c5..ad6fef5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
<br />
<a wicket:id="indexLink" href="#">go to index</a>
@@ -27,5 +27,6 @@
<span wicket:id="feedback" />
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html
index d9f8a5e..2b18de7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html
@@ -6,7 +6,7 @@
</head>
<body>
<!-- component for the examples application -->
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<!-- first example -->
<p>
@@ -26,5 +26,6 @@
Stock quote of <span wicket:id="symbol">symbol</span> is <span wicket:id="quote">quote</span>.
</p>
</p>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
index 09634c7..c13032a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
@@ -7,7 +7,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="border">
@@ -33,5 +33,6 @@ elit. Maecenas lacinia aliquet augue.
</span><!-- end of border -->
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
index c39cbdf..1144a3a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
@@ -7,7 +7,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<span wicket:id="border">
@@ -34,5 +34,6 @@ neque, fermentum accumsan, tincidunt at, suscipit eu, wisi.
</span><!-- end of border -->
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
index c4d776c..ce5ad2e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="template/style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div id="header" class="borderedBlock">
<table width="100%">
@@ -41,5 +41,6 @@
footer
</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
index c1f9bef..cc44499 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<form wicket:id="form">
<table>
@@ -31,5 +31,6 @@
</table>
</form>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
index 864788d..f052487 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
@@ -8,7 +8,7 @@
</style>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>Wicket can also handle file uploads via AJAX, please see AJAX examples section. AJAX Functionality is not included in this example to keep things simple.</p>
<p>The maximum file size of a single upload is: 90k!</p>
@@ -68,5 +68,6 @@
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
index 6622332..4170b1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
@@ -5,7 +5,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div style="border: 2px dotted #fc0; padding: 5px; margin-right: 25%;">
The fields in this page are driven by your data model, creating a new field will automatically add it to the
@@ -18,5 +18,6 @@
</fieldset>
</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
index 5fb3da7..7d9f063 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h3>Velocity Template Component</h3>
<div style="border: 2px dotted #fc0; padding: 5px; margin-right: 25%;">
@@ -27,5 +27,6 @@
</li>
</ul>
</wicket:link>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
index ee18322..33019c8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
@@ -5,7 +5,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<table cellpadding="5px">
<tr>
@@ -43,5 +43,6 @@
<span wicket:id="feedback"/>
</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
index 1132bd0..08acd85 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<h3>Examples of extension's wizards package</h3>
@@ -21,5 +21,6 @@
</li>
</ul>
+</wicket:extend>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
index 46d25b6..42ea7f9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<div>
<wicket:link><a href="Index.html">[back to the wizard index]</a></wicket:link>
@@ -13,5 +13,6 @@
<div wicket:id="wizard">Wizard will be placed here</div>
+</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
index 111c00d..f484228 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
@@ -22,13 +22,14 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<a href="Index.html" wicket:id="back">[go back]</a><p/>
<wicket:child/>
<p>
<span wicket:id="localizedLabel">[I am a localized depending on the URL's first segment]</span>
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
index 11acba3..2613168 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
@@ -22,7 +22,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<a href="index.html">[go back]</a><br/>
<wicket:child/>
@@ -47,6 +47,7 @@
<p><wicket:link><a href="print/sheet1/a4">A mounted resource that prints sheets in different formats</a></wicket:link></p>
- </body>
+ </wicket:extend>
+</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
index 8ed7f3c..75d0992 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
@@ -22,7 +22,7 @@
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<a href="Index.html" wicket:id="back">[go back]</a><p/>
<wicket:child/>
@@ -43,6 +43,7 @@
</pre>
</div>
</p>
- </body>
+ </wicket:extend>
+</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c954da6/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
index b944180..6b4f143 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
+++ b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" type="text/css" href="style.css"/>
</head>
<body>
- <span wicket:id="mainNavigation"/>
+ <wicket:extend>
<p>
This page was loaded from the web context. It was found by the custom resource stream locator,
which is set in the application object of this example.
@@ -15,5 +15,6 @@
taking the path into account. This is not the preferred way of doing thing, but
it is here to show you that you can do your own path interpretation.
</p>
+</wicket:extend>
</body>
</html>