http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..766f622 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +36,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/0178ccab/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..cdc6561 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +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/0178ccab/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..797e8fc 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 @@ -1,54 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -<head> - <title>Wicket Examples - component reference</title> - <link rel="stylesheet" type="text/css" href="style.css"/> -</head> -<body> - <span wicket:id="mainNavigation"/> - - <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> - - <p> - A RadioGroup and Radio components let users select a single value from a group of radio buttons. These components are more flexible then the RadioChoice component in that individual radio choices are full components, unlike with RadioChoice, and thus can be used anywhere in the markup. - </p> - <p> - <form wicket:id="form"> - <wicket:container wicket:id="group"> - <wicket:container wicket:id="group2"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> - <tr> - <td valign="top">Select a person</td> - <td> - <table cellspacing="0" cellpadding="2"> - <tr> - <td><b>Select1</b></td> - <td><b>Select2</b></td> - <td><b>First Name</b></td> - <td><b>Last Name</b></td> - </tr> - <tr wicket:id="persons"> - <td><input type="radio" wicket:id="radio"/></td> - <td><input type="radio" wicket:id="radio2"/></td> - <td><span wicket:id="name">[this is where name will be]</span></td> - <td><span wicket:id="lastName">[this is where lastname will be]</span></td> - </tr> - </table> - <span valign="top"> - </span> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="submit" /> - </td> - </tr> - </table> - </wicket:container> - </wicket:container> - </form> - </p> - <span wicket:id="feedback">feedbackmessages will be put here</span> -</body> -</html> +<?xml version="1.0" encoding="UTF-8"?> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> +<head> + <title>Wicket Examples - component reference</title> +</head> +<body> + <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> + + <p> + A RadioGroup and Radio components let users select a single value from a group of radio buttons. These components are more flexible then the RadioChoice component in that individual radio choices are full components, unlike with RadioChoice, and thus can be used anywhere in the markup. + </p> + <p> + <form wicket:id="form"> + <wicket:container wicket:id="group"> + <wicket:container wicket:id="group2"> + <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <tr> + <td valign="top">Select a person</td> + <td> + <table cellspacing="0" cellpadding="2"> + <tr> + <td><b>Select1</b></td> + <td><b>Select2</b></td> + <td><b>First Name</b></td> + <td><b>Last Name</b></td> + </tr> + <tr wicket:id="persons"> + <td><input type="radio" wicket:id="radio"/></td> + <td><input type="radio" wicket:id="radio2"/></td> + <td><span wicket:id="name">[this is where name will be]</span></td> + <td><span wicket:id="lastName">[this is where lastname will be]</span></td> + </tr> + </table> + <span valign="top"> + </span> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="submit" /> + </td> + </tr> + </table> + </wicket:container> + </wicket:container> + </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/0178ccab/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..4ccb3f7 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +51,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/0178ccab/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..a5c26ca 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +21,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/0178ccab/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..494eaf2 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +20,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/0178ccab/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..cef549e 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +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/0178ccab/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..9de8985 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> - <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 +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/0178ccab/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..8cb5874 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 @@ -1,24 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> +<html> <head> - <title>Wicket Examples - custom resource loading</title> - <link rel="stylesheet" type="text/css" href="style.css"/> +<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> +<meta charset="utf-8"> +<title>Home | Apache Wicket</title> +<meta name="viewport" content="width=device-width, initial-scale=1" /> + +<link rel="shortcut icon" href="favicon.ico" + type="image/vnd.microsoft.icon" /> +<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> - <span wicket:id="mainNavigation"/> - <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 - component that loads it's template from a database and for which you don't want the application - to have to know about it's differing loading resource. - </p> - <p> - This example loads the custom template just once, though it may reload when resource polling is - turned on and the template changes. If you want a load the template every time a page (or panel) - is requested, you can additionally let your container implement IMarkupCacheKeyProvider, and then - return null in the implementation of getCacheKey; Wicket will not cache templates without a - 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> + <div wicket:id="pageHeader"> + </div> + <main> + <div class="l-container"> + <div class="text-right"> + <a wicket:id="sources" class="button"> + Source code + </a> + </div> + <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 + component that loads it's template from a database and for which you don't want the application + to have to know about it's differing loading resource. + </p> + <p> + This example loads the custom template just once, though it may reload when resource polling is + turned on and the template changes. If you want a load the template every time a page (or panel) + is requested, you can additionally let your container implement IMarkupCacheKeyProvider, and then + return null in the implementation of getCacheKey; Wicket will not cache templates without a + 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> + </div> + </main> </body> -</html> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..ed77b89 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - custom resource loading</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> + <wicket:extend> <ul> <wicket:link> <li> @@ -21,5 +20,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/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html index 2589935..7778689 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html @@ -4,10 +4,9 @@ xmlns:wicket="http://wicket.apache.org"; xml:lang="en" lang="en"> <head> <title>Wicket Examples - DateTime</title> - <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation" /> + <wicket:extend> <form wicket:id="form"> <div> @@ -55,5 +54,6 @@ <input wicket:id="submit" type="submit" value="Submit"/> </form> - </body> + </wicket:extend> +</body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..80fa519 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - echo</title> - <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 +12,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/0178ccab/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..0fa2b65 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 @@ -3,10 +3,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - encodings</title> - <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"> @@ -17,7 +16,8 @@ <br/> <span wicket:id="message">Here comes the hello world message ...</span> <p> - Test: ��� + Test: äöü </p> +</wicket:extend> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html index 4caa435..ea6236f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html @@ -1,11 +1,11 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - Events</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <a href="Index.html" wicket:id="back">[go back]</a><p/> <wicket:child/> +</wicket:extend> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..25cb9c7 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 @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - forminput</title> - <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 +81,6 @@ <div id="feedbackPanel"> <span wicket:id="feedback"/> </div> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..5401e16 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 @@ -2,9 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Top Frame</title> - <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/0178ccab/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..865c607 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 @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - guestbook</title> - <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 +27,6 @@ More comment text here. </p> </wicket:remove> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..574e607 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - guice</title> - <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 +26,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/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html index 90e2405..5f45e56 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org/wicket";> <head> <title>Wicket Examples - hangman</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <p><span wicket:id="guessesRemaining" id="guessesRemaining">3</span> guesses remaining</p> <p>Word: <span wicket:id="word">WICK_T</span></p> <p> @@ -14,5 +13,6 @@ </span> </div> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..b66eead 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 @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - hangman</title> - <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 +11,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/0178ccab/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..7622a5a 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 @@ -1,12 +1,12 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - hangman</title> - <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/0178ccab/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..a529d17 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 @@ -1,12 +1,12 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - hangman</title> - <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/0178ccab/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..9569b87 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 @@ -2,10 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - hellobrowser</title> - <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 +17,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/0178ccab/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..1c357f2 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 @@ -2,10 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - helloworld</title> - <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/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java index c516fb6..ceea19e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java @@ -16,14 +16,13 @@ */ package org.apache.wicket.examples.homepage; -import org.apache.wicket.Application; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.examples.WicketExamplePage; +import org.apache.wicket.markup.html.panel.Panel; /** * @author mocleiri */ -public class HomePage extends WebPage +public class HomePage extends WicketExamplePage { private static final long serialVersionUID = 1L; @@ -34,24 +33,17 @@ public class HomePage extends WebPage public HomePage() { super(); - - add(new Label("version", () -> { - /* - * Read the specification version from the wicket-core MANIFEST.MF file. - */ - Package p = Application.class.getPackage(); - - String version = p.getSpecificationVersion(); - - if (version == null || version.length() == 0) - { - return "Missing Version"; - } - else - { - return version; - } - })); } - + + @Override + protected Panel buildHeader(String id) + { + return new HomePageHeader(id); + } + + @Override + protected boolean showSourceButton() + { + return false; + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html new file mode 100644 index 0000000..14337cd --- /dev/null +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html @@ -0,0 +1,22 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="UTF-8"> +<title>Insert title here</title> +</head> +<body> + <wicket:panel> + <div class="header jumbotron"> + <nav class="mainmenu"> + </nav> + <div class="jumbotron-logo"> + <a wicket:id="headerhomelink"><img wicket:id="headerimage" alt="Apache Wicket"></a> + </div> + <div class="jumbotron-mission">Live examples to learn Apache Wicket</div> + <div class="jumbotron-download"> + Wicket version: <span wicket:id="version"></span> + </div> + </div> + </wicket:panel> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java new file mode 100644 index 0000000..7c205f6 --- /dev/null +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java @@ -0,0 +1,45 @@ +package org.apache.wicket.examples.homepage; + +import org.apache.wicket.Application; +import org.apache.wicket.examples.WicketExamplePage; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.markup.html.link.ExternalLink; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.Model; +import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.resource.PackageResourceReference; + +public class HomePageHeader extends Panel { + + public HomePageHeader(String id) + { + super(id); + + add(new Label("version", () -> + { + /* + * Read the specification version from the wicket-core MANIFEST.MF file. + */ + Package p = Application.class.getPackage(); + + String version = p.getSpecificationVersion(); + + if (version == null || version.length() == 0) + { + return "Missing Version"; + } + else + { + return version; + } + })); + + ExternalLink externalLink = new ExternalLink("headerhomelink", + Model.of(WebApplication.get().getServletContext().getContextPath())); + + externalLink.add(new Image("headerimage", new PackageResourceReference(WicketExamplePage.class, "logo-apachewicket-examples-white.svg"))); + + add(externalLink); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..f99927e 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 @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - images</title> - <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 +23,6 @@ <img wicket:id="image7"/> </picture> <img wicket:id="inline"/> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..fc927a5 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 @@ -3,13 +3,13 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - Kitten-Captch</title> - <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/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html index d8ded31..66ec54a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - library</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation" /> + <wicket:extend> <p> <wicket:link><a href = "Home.html">Home</a></wicket:link>  @@ -16,5 +15,6 @@ </div> </p> +</wicket:extend> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html index e5f4cfd..38f7e28 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - library</title> - <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/0178ccab/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..83c1a1f 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 @@ -1,11 +1,11 @@ -<html xmlns:wicket="http://wicket.apache.org";> -<head> - <title>Wicket Examples - signin2</title> - <link rel="stylesheet" type="text/css" href="style.css"/> -</head> -<body> - <span wicket:id="mainNavigation"/> - <h2>Goodbye!</h2> - <wicket:link><a href="Home.html">Home</a></wicket:link> -</body> -</html> +<html xmlns:wicket="http://wicket.apache.org";> +<head> + <title>Wicket Examples - signin2</title> +</head> +<body> + <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/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html index 7e66c82..e57ee49 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Title: <span wicket:id = "title">Huckleberry Finn</span></h2> <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/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..3bfd11e 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 @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> + <wicket:extend> <!-- Example to demonstrate different kinds of linking supported --> @@ -58,5 +57,6 @@ <span wicket:id="feedback" /> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html index 2933c19..37d27d0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page1</h2> <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html index 2c6d425..4aba440 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page2</h2> <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html index 178aa87..04f94e4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page3</h2> @@ -14,6 +13,6 @@ </p> <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html index 7630b8e..d666b61 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - linkomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Popup</h2> @@ -14,6 +13,6 @@ </p> <a wicket:id = "close" href="#">close</a> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html index 80baf05..489edc2 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html @@ -1,29 +1,29 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - videos</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <div wicket:id="mainNavigation"></div> - <h2>Below there are three types of videos to show the basic functionality of Wicket's media implementation</h2> - <h3>The implementation features full support of video / audio / source / track tags.</h3> - <div> - <!-- Video 1 --> - <video wicket:id="video1" ></video> - <div class="videoDescription"><b>Video1</b><br/>Demonstrate the basic set of methods to configure a video (setAutoplay(false); setControls(true); setLooping(false); setWidth(320); setHeight(240);) The width and height are null by default which means that the video is going to be rendered in size of the media file. The PackageResourceReference is set to readBuffered(false) which means that the media file is not stored in memory.</div> - <div class="clearer"></div> - - <!-- Video 2 --> - <video wicket:id="video2" > - <source wicket:id="source2" /> - </video> - <div class="videoDescription"><b>Video2</b><br/>This video is rendered with a source tag. You can add many source tags and apply a media query (setMedia(query);) so that based on the resolution different videos are going to be displayed.</div> - <div class="clearer"></div> - - <!-- Video 3 --> - <video wicket:id="video3" ></video> - <div class="videoDescription"><b>Video3</b><br/>The last sample shows a remote video located here: https://w3c-test.org/media/movie_300.mp4. It can be added by set the url as String instead of adding a ResourceReference.</div> - <div class="clearer"></div> - </div> + <wicket:extend> + <h2>Below there are three types of videos to show the basic functionality of Wicket's media implementation</h2> + <h3>The implementation features full support of video / audio / source / track tags.</h3> + <div> + <!-- Video 1 --> + <video wicket:id="video1" ></video> + <div class="videoDescription"><b>Video1</b><br/>Demonstrate the basic set of methods to configure a video (setAutoplay(false); setControls(true); setLooping(false); setWidth(320); setHeight(240);) The width and height are null by default which means that the video is going to be rendered in size of the media file. The PackageResourceReference is set to readBuffered(false) which means that the media file is not stored in memory.</div> + <div class="clearer"></div> + + <!-- Video 2 --> + <video wicket:id="video2" > + <source wicket:id="source2" /> + </video> + <div class="videoDescription"><b>Video2</b><br/>This video is rendered with a source tag. You can add many source tags and apply a media query (setMedia(query);) so that based on the resolution different videos are going to be displayed.</div> + <div class="clearer"></div> + + <!-- Video 3 --> + <video wicket:id="video3" ></video> + <div class="videoDescription"><b>Video3</b><br/>The last sample shows a remote video located here: https://w3c-test.org/media/movie_300.mp4. It can be added by set the url as String instead of adding a ResourceReference.</div> + <div class="clearer"></div> + </div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.html index 4e6500d..0ad3dc7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticBorder.html @@ -1,7 +1,6 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - navomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> <wicket:border> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html index a619ce0..b1df157 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html @@ -1,19 +1,19 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - navomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <div wicket:id = "mainNavigation"></div> - <div wicket:id = "navomaticBorder"> - <div style = "width:250px"> - <div style="text-align: center;"><h3>Page 1</h3></div> - Welcome to Navomatic. The navigation links on the left - will allow you to navigate between three pages. Notice that the current page - (Page1) is displayed in the "Navigation Links" area as italicized text, - while the other pages are displayed as clickable links. Go ahead - and click the "Page2" link now. - </div> - </div> + <wicket:extend> + <div wicket:id = "navomaticBorder"> + <div style = "width:250px"> + <div style="text-align: center;"><h3>Page 1</h3></div> + Welcome to Navomatic. The navigation links on the left + will allow you to navigate between three pages. Notice that the current page + (Page1) is displayed in the "Navigation Links" area as italicized text, + while the other pages are displayed as clickable links. Go ahead + and click the "Page2" link now. + </div> + </div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html index 90c64e9..52b57b6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html @@ -1,17 +1,17 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - navomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <div wicket:id = "mainNavigation"></div> - <div wicket:id = "navomaticBorder"> - <div style = "width:250px"> - <div style="text-align: center;"><h3>Page 2</h3></div> - Welcome to Page 2 of Navomatic. Notice that the Page1 link is now clickable - (so that you can return to Page1 if you want to) and the Page2 link is - italicized text. Go ahead and click the Page3 link. - </div> - </div> + <wicket:extend> + <div wicket:id = "navomaticBorder"> + <div style = "width:250px"> + <div style="text-align: center;"><h3>Page 2</h3></div> + Welcome to Page 2 of Navomatic. Notice that the Page1 link is now clickable + (so that you can return to Page1 if you want to) and the Page2 link is + italicized text. Go ahead and click the Page3 link. + </div> + </div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html index 4daf41d..baa05cd 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html @@ -1,30 +1,30 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - navomatic</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <div wicket:id = "mainNavigation"></div> - <div wicket:id = "navomaticBorder"> - <div style = "width:400px"> - <div style="text-align: center;"><h3>Page 3</h3></div> - The links on the left are enabled and disabled without - any code at all. Here is the HTML for the navigation area, - which can be found in NavomaticBorder.html: - <pre> - <b>Navigation Links</b> - <p> - <wicket:link> - <a href = "Page1.html">Page1</a><br/> - <a href = "Page2.html">Page2</a><br/> - <a href = "Page3.html">Page3</a> - </wicket:link> - </p></pre> - The <wicket:link> tag turns on auto-linking, which - creates page links automatically at render-time. The - NavomaticBorder component is reused between all three pages, - adding navigation links to each. - </div> - </div> + <wicket:extend> + <div wicket:id = "navomaticBorder"> + <div style = "width:400px"> + <div style="text-align: center;"><h3>Page 3</h3></div> + The links on the left are enabled and disabled without + any code at all. Here is the HTML for the navigation area, + which can be found in NavomaticBorder.html: + <pre> + <b>Navigation Links</b> + <p> + <wicket:link> + <a href = "Page1.html">Page1</a><br/> + <a href = "Page2.html">Page2</a><br/> + <a href = "Page3.html">Page3</a> + </wicket:link> + </p></pre> + The <wicket:link> tag turns on auto-linking, which + creates page links automatically at render-time. The + NavomaticBorder component is reused between all three pages, + adding navigation links to each. + </div> + </div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html index 5bac931..d7672fe 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <p> This example displays how you can work with 'nice' urls for bookmarkable pages. @@ -41,5 +40,6 @@  After Page 5 is displayed click refresh link to see url parameters in action <br /> </p> - </body> + </wicket:extend> +</body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html index c390931..58f9b55 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page1</h2> <p><a wicket:id="homeLink" href="#">[go back]</a></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html index 47638a0..1f0de3f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page2</h2> @@ -14,7 +13,8 @@ param1: <span wicket:id="p1">param1</span><br/> param2: <span wicket:id="p2">param2</span><br/> -<br/><br/> -<a href="#" wicket:id="refreshLink">refresh with different params</a> + <br/><br/> + <a href="#" wicket:id="refreshLink">refresh with different params</a> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.html deleted file mode 100644 index 47638a0..0000000 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.html +++ /dev/null @@ -1,20 +0,0 @@ -<html xmlns:wicket="http://wicket.apache.org";> -<head> - <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> -</head> -<body> - - <span wicket:id = "mainNavigation"/> - - <h2>Welcome to Page2</h2> - - <p><a wicket:id="homeLink" href="#">[go back]</a></p> - - param1: <span wicket:id="p1">param1</span><br/> - param2: <span wicket:id="p2">param2</span><br/> - -<br/><br/> -<a href="#" wicket:id="refreshLink">refresh with different params</a> -</body> -</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.html deleted file mode 100644 index 47638a0..0000000 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.html +++ /dev/null @@ -1,20 +0,0 @@ -<html xmlns:wicket="http://wicket.apache.org";> -<head> - <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> -</head> -<body> - - <span wicket:id = "mainNavigation"/> - - <h2>Welcome to Page2</h2> - - <p><a wicket:id="homeLink" href="#">[go back]</a></p> - - param1: <span wicket:id="p1">param1</span><br/> - param2: <span wicket:id="p2">param2</span><br/> - -<br/><br/> -<a href="#" wicket:id="refreshLink">refresh with different params</a> -</body> -</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html index 7cd6cb3..a766510 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page3</h2> <p><a wicket:id="homeLink" href="#">[go back]</a></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html index b4cc92d..293618b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html @@ -1,15 +1,14 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page4</h2> <p><a wicket:id="homeLink" href="#">[go back]</a></p> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html index 47638a0..7fe5339 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html @@ -1,11 +1,10 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - niceurl</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Page2</h2> @@ -14,7 +13,8 @@ param1: <span wicket:id="p1">param1</span><br/> param2: <span wicket:id="p2">param2</span><br/> -<br/><br/> -<a href="#" wicket:id="refreshLink">refresh with different params</a> + <br/><br/> + <a href="#" wicket:id="refreshLink">refresh with different params</a> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html index 95d778a..107b268 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> This is tooootally the best beer you can get for under a buck. @@ -22,5 +21,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html index fd5972c..33b438a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html @@ -2,10 +2,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> En rigtig god øl fra en af de gode danske mikrobryggerier. @@ -23,5 +22,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html index 2c6f7f8..c4f565b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> Etwas ganz besonderes aus der Region @@ -22,5 +21,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html index 7d7be53..0f1353b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> Super beer for a Looney, eh? @@ -22,5 +21,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html index 85f9504..1ee79fe 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html @@ -2,10 +2,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> Iszol te eleget? Nehogy kiszáradj! @@ -23,5 +22,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html index 2bae112..3698877 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket 예제 - 호프집</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">인사</span> <p> 안녕하세요, 맥주 드릴까요? @@ -22,5 +21,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html index 84b7d15..7f60cc7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> Goed bier uut t oosten. @@ -22,5 +21,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html index b2dd759..4f33078 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html @@ -3,10 +3,9 @@ <head> <title>Wicket Examples - pub</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id = "salutation">Salutation</span> <p> æ¨çæä½³éæ© @@ -24,5 +23,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html index 15f45b6..5e822df 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html @@ -1,10 +1,9 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - pub</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"></span> +<wicket:extend> <span wicket:id="salutation">Salutation</span> <p> <wicket:message key="salespitch"> @@ -26,5 +25,6 @@ <a href="#" wicket:id="goKorean">[go Korean]</a>  <a href="#" wicket:id="goHungarian">[go Hungarian]</a> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html index 42a3179..f5f5e38 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html @@ -10,6 +10,7 @@ This is a demo of the DataTable (DataView wrapper). Provided features:<br/> <li>Adds a navigator message</li> </ul> <br/> - -<table class="dataview" cellspacing="0" wicket:id="table">[table]</table> +<div style="overflow-x:auto;"> + <table class="dataview" cellspacing="0" wicket:id="table">[table]</table> +</div> </wicket:extend> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html index 46e5656..e698069 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html @@ -1,3 +1,18 @@ +<wicket:head> +<style type="text/css"> +table { + border-collapse:collapse; +} + +td { + padding: 2px; +} + +table, th, td { + border: 1px solid black; +} +</style> +</wicket:head> <wicket:extend xmlns:wicket="http://wicket.apache.org";> @@ -6,12 +21,13 @@ This is a demo of the DataGridView (builds on top of DataView). Provided feature <li>Easy ordering and selection of columns from code</li> </ul> <br/> - -<table cellspacing="0" cellpadding="2" border="1"> - <tr wicket:id="rows"> - <td wicket:id="cells"> - <span wicket:id="cell">cell content goes here</span> - </td> - </tr> -</table> +<div style="overflow-x:auto;"> + <table cellspacing="0" cellpadding="2" border="1"> + <tr wicket:id="rows"> + <td wicket:id="cells"> + <span wicket:id="cell">cell content goes here</span> + </td> + </tr> + </table> +</div> </wicket:extend> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html index 545d5cc..5866393 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html @@ -22,7 +22,9 @@ This table has a toolbar filter. We can specify a valid range for contact's born <span style="float: right;">from: <input wicket:id="dateFrom"/></span> <br/> <span style="float: right;">to: <input wicket:id="dateTo"/></span> </fieldset> - <table class="dataview" wicket:id="tableWithFilterForm">[table]</table> + <div style="overflow-x:auto;"> + <table class="dataview" wicket:id="tableWithFilterForm">[table]</table> + </div> </form> </wicket:extend> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html index 006079f..09e5eae 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html @@ -24,15 +24,17 @@ This is a demo of the DataTable (DataView wrapper). Provided features:<br/> <li>Export to CSV toolbar</li> </ul> <br/> - - <table class="dataview" cellspacing="0" wicket:id="table">[table]</table> - + <div style="overflow-x:auto;"> + <table class="dataview" cellspacing="0" wicket:id="table">[table]</table> + </div> <br/> <hr/> <br/> <span>This is a table that uses <em>org.apache.wicket.extensions.markup.html.repeater.data.table.ColGroup</em> to style the columns</span>: - <table class="dataview" wicket:id="tableWithColGroup">[table]</table> + <div style="overflow-x:auto;"> + <table class="dataview" wicket:id="tableWithColGroup">[table]</table> + </div> </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html index 31a312e..863d0e4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html @@ -1,16 +1,16 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - repeater views</title> - <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id = "mainNavigation"/> + <wicket:extend> <h2>Welcome to Repeater View Examples</h2> <p><wicket:link><a href="Index.html">[go back]</a></wicket:link></p> <wicket:child/> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html index 1eabeaa..79089b1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html @@ -5,24 +5,26 @@ RefreshingView in a form, with a <tt>remove</tt> link along with each item. <br/><br/> <form wicket:id="form"> -<table cellspacing="0" class="dataview"> - <tr> - <th>Actions</th> - <th>ID</th> - <th>First Name</th> - <th>Last Name</th> - <th>Home Phone</th> - <th>Cell Phone</th> - </tr> - <tr wicket:id="simple"> - <td><span wicket:id="actions">[actions]</span></td> - <td><input type="text" wicket:id="id">[contactid]</input> </td> - <td><input type="text" wicket:id="firstName">[firstname]</input></td> - <td><input type="text" wicket:id="lastName">[lastname]</input></td> - <td><input type="text" wicket:id="homePhone">[homephone]</input></td> - <td><input type="text" wicket:id="cellPhone">[cellphone]</input></td> - </tr> -</table> +<div style="overflow-x:auto;"> + <table cellspacing="0" class="dataview"> + <tr> + <th>Actions</th> + <th>ID</th> + <th>First Name</th> + <th>Last Name</th> + <th>Home Phone</th> + <th>Cell Phone</th> + </tr> + <tr wicket:id="simple"> + <td><span wicket:id="actions">[actions]</span></td> + <td><input type="text" wicket:id="id">[contactid]</input> </td> + <td><input type="text" wicket:id="firstName">[firstname]</input></td> + <td><input type="text" wicket:id="lastName">[lastname]</input></td> + <td><input type="text" wicket:id="homePhone">[homephone]</input></td> + <td><input type="text" wicket:id="cellPhone">[cellphone]</input></td> + </tr> + </table> +</div> </form> </wicket:extend> http://git-wip-us.apache.org/repos/asf/wicket/blob/0178ccab/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html index bb17ad3..a7a274b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html @@ -1,3 +1,18 @@ +<wicket:head> +<style type="text/css"> +table { + border-collapse:collapse; +} + +td { + padding: 2px; +} + +table, th, td { + border: 1px solid black; +} +</style> +</wicket:head> <wicket:extend xmlns:wicket="http://wicket.apache.org";> This page demonstrates the GridView component @@ -5,10 +20,11 @@ This page demonstrates the GridView component <span wicket:id="navigator">[dataview navigator]</span> -<table cellspacing="0" cellpadding="2" border="1"> - <tr wicket:id="rows"> - <td wicket:id="cols"><span wicket:id="firstName">[firstname]</span></td> - </tr> -</table> - +<div style="overflow-x:auto;"> + <table cellspacing="0" cellpadding="2" border="1"> + <tr wicket:id="rows"> + <td wicket:id="cols"><span wicket:id="firstName">[firstname]</span></td> + </tr> + </table> +</div> </wicket:extend>
