Repository: wicket Updated Branches: refs/heads/3435-use-bootstrap-for-examples 1ba689baf -> 63c909c4e
WICKET-3435 Revamp Wicket Examples with the new website L&F Bootstrapify Wicket Examples (compref) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/63c909c4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/63c909c4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/63c909c4 Branch: refs/heads/3435-use-bootstrap-for-examples Commit: 63c909c4e1f284c40a614c4b859071022722ce63 Parents: 1ba689b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Nov 29 14:27:46 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Nov 29 14:28:36 2014 +0100 ---------------------------------------------------------------------- .../examples/compref/BookmarkablePage.html | 4 +- .../compref/BookmarkablePageLinkPage.html | 9 +-- .../wicket/examples/compref/BorderPage.html | 11 ++- .../wicket/examples/compref/ButtonPage.html | 18 ++--- .../wicket/examples/compref/CheckBoxPage.html | 36 +++++----- .../examples/compref/CheckBoxSelectorPage.html | 5 +- .../wicket/examples/compref/CheckGroupPage.html | 70 ++++++++++---------- .../wicket/examples/compref/CheckGroupPage.java | 3 +- .../examples/compref/CheckGroupPage2.html | 4 +- .../examples/compref/DropDownChoicePage.html | 4 +- .../examples/compref/ExternalLinkPage.html | 8 ++- .../examples/compref/ExternalLinkPage.java | 8 +-- .../wicket/examples/compref/FormPage.html | 6 +- .../wicket/examples/compref/FormPage.java | 7 +- .../wicket/examples/compref/FragmentPage.html | 36 +++++----- .../wicket/examples/compref/FragmentPage.java | 4 +- .../wicket/examples/compref/IncludePage.html | 4 +- .../apache/wicket/examples/compref/Index.html | 3 +- .../wicket/examples/compref/LabelPage.html | 13 ++-- .../wicket/examples/compref/LabelPage.java | 4 +- .../wicket/examples/compref/LinkPage.html | 12 ++-- .../wicket/examples/compref/ListChoicePage.html | 4 +- .../compref/ListMultipleChoicePage.html | 4 +- .../examples/compref/MultiLineLabelPage.html | 6 +- .../apache/wicket/examples/compref/MyPanel.html | 4 +- .../wicket/examples/compref/PalettePage.html | 11 +-- .../wicket/examples/compref/PanelPage.html | 6 +- .../examples/compref/RadioChoicePage.html | 4 +- .../wicket/examples/compref/RadioGroupPage.html | 4 +- .../examples/compref/RadioGroupPage2.html | 4 +- .../wicket/examples/compref/SelectPage.html | 4 +- .../wicket/examples/compref/SubmitLinkPage.html | 14 ++-- .../wicket/examples/compref/SubmitLinkPage.java | 5 +- .../examples/compref/TabbedPanelPage.html | 4 +- .../wicket/examples/compref/TextAreaPage.html | 37 +++++------ .../wicket/examples/compref/TextAreaPage.java | 9 +-- .../wicket/examples/compref/TextFieldPage.html | 44 ++++++------ .../wicket/examples/compref/TextFieldPage.java | 5 +- 38 files changed, 235 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.html index 480dcd6..1c00749 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.html @@ -15,7 +15,7 @@ <p> The message beneath is either the message that was passed as a PageParameters argument (which maps directly to a request parameter) or the default message. <br /> - <span wicket:id="messageLabel" class="mark">message comes here</span> + <span wicket:id="messageLabel" style="text-decoration: underline">message comes here</span> </p> <p> @@ -23,4 +23,4 @@ </p> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..5181ea1 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> @@ -17,12 +17,13 @@ </p> <p> - <a wicket:id="pageLinkNoArgs">go to our bookmarkable page without passing any arguments</a> + <a class="btn btn-link" wicket:id="pageLinkNoArgs">go to our bookmarkable page without passing any arguments</a> </p> <p> - <a wicket:id="pageLinkWithArgs">go to our bookmarkable page passing a message argument</a> + <a class="btn btn-link" 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 +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..d14cdbb 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 @@ -1,11 +1,7 @@ <?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"/> +<wicket:extend> <h1>wicket.markup.html.border.Border</h1> <wicket:link><a href="Index.html">[back to the reference]</a></wicket:link> @@ -25,10 +21,11 @@ </p> <p> - <span wicket:id="border" class="mark"> - <span wicket:id="label" class="mark">label contents here</span> + <span wicket:id="border"> + <span wicket:id="label" style="line-height: 2em" style="text-decoration: underline">label contents here</span> </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/63c909c4/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..76f48bf 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> @@ -29,13 +29,15 @@ </p> <p> - <form wicket:id="form"> - <input type="submit" value="non wicket submit button" /> - <input wicket:id="button1" type="submit" value="default wicket button" /> - <input wicket:id="button2" type="submit" value="wicket button with setDefaultFormProcessing(false)" /> - </form> - <span wicket:id="feedback">feedbackmessages will be put here</span> + <form wicket:id="form"> + <input type="submit" class="btn btn-primary" value="non wicket submit button" /> + <input wicket:id="button1" type="submit" class="btn btn-default" value="default wicket button" /> + <input wicket:id="button2" type="submit" class="btn btn-info" value="wicket button with setDefaultFormProcessing(false)" /> + </form> + <span wicket:id="feedback">feedbackmessages will be put here</span> </p> - <span wicket:id="explainPanel">panel contents come here</span> + <span wicket:id="explainPanel">panel contents come here</span> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..c0f7071 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> @@ -14,26 +14,22 @@ A Checkbox can be used to work with boolean values. If the checkbox is checked, it means that the model value is true. It is false otherwise. </p> - <p> - <form wicket:id="form"> - - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> - <tr> - <td valign="top">I want it checked!</td> - <td> - <input type="checkbox" wicket:id="bool" /> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="submit" /> - </td> - </tr> - </table> - </form> - <span wicket:id="feedback">feedbackmessages will be put here</span> - </p> + <div class="row"> + <div class="col-sm-offset-1 col-sm-3"> + <form wicket:id="form" role="form"> + <div class="checkbox"> + <label> + <input type="checkbox" wicket:id="bool"> I want it checked! + </label> + </div> + <button type="submit" class="btn btn-default">Submit</button> + </form> + </div> + </div> + <div wicket:id="feedback">feedbackmessages will be put here</div> <span wicket:id="explainPanel">panel contents come here</span> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..eaa367e 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> @@ -36,6 +36,7 @@ <input type="checkbox" wicket:id="looseCheck4"/> 4 <input type="checkbox" wicket:id="looseSelector"/> select all </form> - </p> + </p> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..58f4c3c 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> @@ -13,40 +13,40 @@ <p> A CheckBoxGroup and CheckBoxComponnet components let users select multiple values from a group of checkboxes. These components are more flexible then the CheckBoxMultipleChoice component in that individual checkboxes are full components, unlike with CheckBoxMultipleChoice, and thus can be used anywhere in the markup. </p> - <p> - <form wicket:id="form"> - <span wicket:id="group"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> - <tr> - <td valign="top">Select persons</td> - <td> - <input type="checkbox" wicket:id="groupselector">check/uncheck all</input><br/> - <table cellspacing="0" cellpadding="2"> - <tr> - <td><b>Select</b></td> - <td><b>First Name</b></td> - <td><b>Last Name</b></td> - </tr> - <tr wicket:id="persons"> - <td><input type="checkbox" wicket:id="checkbox"/></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> - </span> - </form> - <span wicket:id="feedback">feedbackmessages will be put here</span> - </p> + + <div class="row"> + <div class="col-sm-offset-1 col-sm-3"> + <form wicket:id="form" role="form"> + <fieldset wicket:id="group"> + <legend>Select persons</legend> + + <div class="checkbox"> + <label> + <input type="checkbox" wicket:id="groupselector"/> check/uncheck all + </label> + </div> + + <div class="row"> + <div class="col-sm-4"><strong>Select</strong></div> + <div class="col-sm-4"><strong>First Name</strong></div> + <div class="col-sm-4"><strong>Last Name</strong></div> + </div> + + <div wicket:id="persons" class="row"> + <div class="col-sm-4"><input type="checkbox" wicket:id="checkbox"/></div> + <div class="col-sm-4"><span wicket:id="name">[this is where name will be]</span></div> + <div class="col-sm-4"><span wicket:id="lastName">[this is where lastname will be]</span></div> + </div> + + <button type="submit" class="btn btn-primary">Submit</button> + </fieldset> + </form> + </div> + </div> + + <div wicket:id="feedback">feedbackmessages will be put here</div> <span wicket:id="explainPanel">panel contents come here</span> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java index 7da2851..6e81d07 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java @@ -18,6 +18,7 @@ package org.apache.wicket.examples.compref; import java.util.ArrayList; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Check; @@ -76,7 +77,7 @@ public class CheckGroupPage extends WicketExamplePage persons.setReuseItems(true); group.add(persons); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..a1ed2fc 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,7 @@ </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/63c909c4/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..cd7ad7a 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,7 @@ <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/63c909c4/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..d2fa516 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> @@ -16,9 +16,11 @@ </p> <p> - <a href="#" target="_new" wicket:id="externalLink1">this body will be replaced</a> <br /> - <a href="#" target="_new" wicket:id="externalLink2">this body will be replaced</a> + <a class="btn btn-link" target="_blank" wicket:id="externalLink1">this body will be replaced</a> <br /> + <a class="btn btn-link" target="_blank" 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/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java index 69e86de..5a9ac2d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java @@ -33,7 +33,7 @@ public class ExternalLinkPage extends WicketExamplePage public ExternalLinkPage() { // add a link that goes to javalobby - add(new ExternalLink("externalLink1", "http://www.javalobby.org";, "To JavaLobby")); + add(new ExternalLink("externalLink1", "http://java.dzone.com/";, "To Java DZone")); // add a link that goes to the server side add(new ExternalLink("externalLink2", "http://www.theserverside.com";, "To The Server Side")); } @@ -44,8 +44,8 @@ public class ExternalLinkPage extends WicketExamplePage @Override protected void explain() { - String html = "<a href=\"#\" target=\"_new\" wicket:id=\"externalLink1\">this body will be replaced</a>"; - String code = " add(new ExternalLink(\"externalLink1\", \"http://www.javalobby.org\";, \"To JavaLobby\"));"; + String html = "<a target=\"_blank\" wicket:id=\"externalLink1\">this body will be replaced</a>"; + String code = " add(new ExternalLink(\"externalLink1\", \"http://java.dzone.com/\";, \"To Java DZone\"));"; add(new ExplainPanel(html, code)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..fdec892 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> @@ -28,10 +28,12 @@ </p> <p> <form wicket:id="form"> - <input type="submit" value="click me to submit the form and display a message" /> + <button type="submit" class="btn btn-primary">click me to submit the form and display a message</button> </form> <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/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java index a867b06..01145f5 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java @@ -18,7 +18,8 @@ package org.apache.wicket.examples.compref; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.panel.FeedbackPanel; + +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; /** @@ -34,7 +35,7 @@ public class FormPage extends WicketExamplePage public FormPage() { // Add a FeedbackPanel for displaying our messages - FeedbackPanel feedbackPanel = new FeedbackPanel("feedback"); + NotificationPanel feedbackPanel = new NotificationPanel("feedback"); add(feedbackPanel); // Add a form with an onSubmit implementation that sets a message @@ -72,4 +73,4 @@ public class FormPage extends WicketExamplePage } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..5caa359 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,20 +17,22 @@ </p> <span wicket:id="explainPanel">panel contents come here</span> -</body> -<wicket:fragment wicket:id="fragmentid"> + <wicket:fragment wicket:id="fragmentid"> + + <p style="border: 2px dotted #fc0; padding: 5px;"> + A fragment is like a panel, but can be 'inlined', + meaning it does not need it's own markup file, but + can be defined in the markup file of another. For this + example, we use the parent's markup file as the host, + and we do not explicitly tell the fragment which host + to use.<br /> + Like panels, fragments can contain arbitrairy components, + like this label: <span wicket:id="label" style="text-decoration: underline">to be replaced</span>, or<br /> + even another panel: <span wicket:id="otherPanel" style="text-decoration: underline">also to be replaced</span>. + </p> - <p style="border: 2px dotted #fc0; padding: 5px;"> - A fragment is like a panel, but can be 'inlined', - meaning it does not need it's own markup file, but - can be defined in the markup file of another. For this - example, we use the parent's markup file as the host, - and we do not explicitly tell the fragment which host - to use.<br /> - Like panels, fragments can contain arbitrairy components, - like this label: <span wicket:id="label" class="mark">to be replaced</span>, or<br /> - even another panel: <span wicket:id="otherPanel" class="mark">also to be replaced</span>. - </p> - -</wicket:fragment> -</html> \ No newline at end of file + </wicket:fragment> + +</wicket:extend> +</body> +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java index e8a7bf6..8a328ac 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java @@ -65,7 +65,7 @@ public class FragmentPage extends WicketExamplePage { String html = "<wicket:fragment wicket:id=\"fragmentid\">...</wicket:fragment>"; String code = "private class MyFragment extends Fragment {\n ...\n" - + "add(new MyFragment(\"fragment\", \"fragmentid\"));"; + + "add(new MyFragment(\"fragment\", \"fragmentid\", this));"; add(new ExplainPanel(html, code)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..41aa0c3 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,7 @@ </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/63c909c4/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..d7d1642 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/63c909c4/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..7a36ed3 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> @@ -17,14 +17,14 @@ <p> A static label just prints out the text you fed it:<br /> - <span wicket:id="staticLabel" class="mark">this text will be replaced</span> + <div wicket:id="staticLabel" style="text-decoration: underline">this text will be replaced</div> </p> <p> Actually, each label has an instance of IModel backing it. This means we can create dynamic labels, like this label that prints out the current date/time.<br /> - <span wicket:id="dynamicLabel" class="mark">this text will be replaced</span> + <div wicket:id="dynamicLabel" style="text-decoration: underline">this text will be replaced</div> <br />One of the first things you probably noticed, is that the date is nicely formatted, hopefully even in your locale's format. This is because Wicket works with converters. @@ -37,7 +37,7 @@ A lot of times, you want to get the actual text from some other location, like a resource bundle:<br /> - <span wicket:id="resourceLabel" class="mark">this text will be replaced</span> + <div wicket:id="resourceLabel" style="text-decoration: underline">this text will be replaced</div> <br />In this case, the actual display text will be loaded from resource bundle 'LabelPage.properties', and {0} will be replaced with the locale argument we fed it. @@ -48,10 +48,11 @@ troubles/ mess up attempts. However in this example, we actually want any markup to be interpreted by the browser<br /> - <span wicket:id="markupLabel" class="mark">this text will be replaced</span> + <div wicket:id="markupLabel" style="text-decoration: underline">this text will be replaced</div> </p> - <span wicket:id="explainPanel">panel contents come here</span> + <div wicket:id="explainPanel">panel contents come here</div> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java index 47007d5..9e021ec 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java @@ -84,11 +84,11 @@ public class LabelPage extends WicketExamplePage @Override protected void explain() { - String html = "<span wicket:id=\"markupLabel\" class=\"mark\">this text will be replaced</span>"; + String html = "<span wicket:id=\"markupLabel\">this text will be replaced</span>"; String code = " Label markupLabel = new Label(\"markupLabel\", \"now <i>that</i> is a pretty <b>bold</b> statement!\");\n" + " markupLabel.setEscapeModelStrings(false);\n" + " add(markupLabel);"; add(new ExplainPanel(html, code)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..3c08da2 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> @@ -17,24 +17,26 @@ <p> Here is a normal link, attached to an anchor:<br /> - <a href="#" wicket:id="link1">this link is clicked <span wicket:id="label1">n</span> times</a> + <a class="btn btn-link" wicket:id="link1">this link is clicked <span wicket:id="label1">n</span> times</a> </p> <p> Same as above, but this time a link that records a state change.<br /> - <a href="#" wicket:id="linkWithStateChange">this link is clicked <span wicket:id="label">n</span> times</a> + <a class="btn btn-link" wicket:id="linkWithStateChange">this link is clicked <span wicket:id="label">n</span> times</a> </p> <p> And here is a link attached to a button element, with a nested label:<br /> - <button wicket:id="link2">this button is clicked <span wicket:id="label2">n</span> times</button> + <button type="button" class="btn btn-default" wicket:id="link2">this button is clicked <span wicket:id="label2">n</span> times</button> </p> <p> But you could also attach a link to an input/button element, and attach an AttributeModifier to it to display the number of clicks:<br /> - <input type="button" wicket:id="link3" value="this button is clicked n times" /> + <input type="button" class="btn btn-default" 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/63c909c4/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..d10169f 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,7 @@ <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/63c909c4/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..0bf4e35 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,7 @@ <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/63c909c4/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..3286e0a 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> @@ -15,9 +15,11 @@ line breaks (BR tags) for newlines and paragraph markers (P tags) for sequences of more than one newline.<br /> - <span wicket:id="multiLineLabel" class="mark">this text will be replaced</span> + <div wicket:id="multiLineLabel" class="well">this text will be replaced</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/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.html index 6ee9e06..2a260cb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyPanel.html @@ -14,8 +14,8 @@ <p class="panel"> Here are some panel contents for ya.<br /> Put arbitrairy Wicket components in your Panels, - like this label: <span wicket:id="label" class="mark">to be replaced</span>, or<br /> - even another panel: <span wicket:id="otherPanel" class="mark">also to be replaced</span>.<br /> + like this label: <span wicket:id="label" style="text-decoration: underline">to be replaced</span>, or + even another panel: <span wicket:id="otherPanel" style="text-decoration: underline">also to be replaced</span>.<br /> You can nest panels any deep you want: </p> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..0c4116b 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 @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html> <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"/> +<wicket:head> + <style> table.palette { border:0; } table.palette td.header { font-weight: bold; font-size: 12pt; background-color: #eef7ff; padding: 2px; border-top: 1px solid #729ac2; border-bottom: 1px solid #729ac2;} @@ -12,9 +11,9 @@ table.palette td.buttons { text-align: center; padding-left: 10px; padding-right: 10px; } table.palette td.buttons button { width: 28px; height: 28px; } </style> -</head> +</wicket: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 +31,7 @@ <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/63c909c4/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..3128e9f 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> @@ -15,8 +15,8 @@ </p> <div wicket:id="panel">panel contents come here</div> - - <div wicket:id="explainPanel">panel contents come here</div> + <div wicket:id="explainPanel">panel contents come here</div> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..6d8aba4 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,7 @@ <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/63c909c4/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..8f95a38 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,7 @@ <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/63c909c4/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..15901a5 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,7 @@ </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/63c909c4/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..8708ceb 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,7 @@ <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/63c909c4/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..15d4d96 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> @@ -15,12 +15,14 @@ It can be inside the form component or inside the form component. </p> <p> - <form wicket:id="form"> - <a wicket:id="internal">Internal SubmitLink</a> - </form> - <a wicket:id="external">External SubmitLink</a> - <span wicket:id="feedback">feedbackmessages will be put here</span> + <form wicket:id="form"> + <a class="btn btn-link" wicket:id="internal">Internal SubmitLink</a> + </form> + <a class="btn btn-link" wicket:id="external">External SubmitLink</a> + <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/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java index fab473f..7e82fe8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java @@ -19,7 +19,8 @@ package org.apache.wicket.examples.compref; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.SubmitLink; -import org.apache.wicket.markup.html.panel.FeedbackPanel; + +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; /** @@ -35,7 +36,7 @@ public class SubmitLinkPage extends WicketExamplePage public SubmitLinkPage() { // Add a FeedbackPanel for displaying our messages - FeedbackPanel feedbackPanel = new FeedbackPanel("feedback"); + NotificationPanel feedbackPanel = new NotificationPanel("feedback"); add(feedbackPanel); // Add a form with 2 SubmitLinks that can be called http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..5e68280 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,7 @@ <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/63c909c4/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..ca57582 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> @@ -13,26 +13,23 @@ <p> A TextArea is like a TextField, but is used for multiple rows of text. </p> - <p> - <form wicket:id="form"> - - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> - <tr> - <td valign="top">multiple lines of text</td> - <td> - <textarea wicket:id="text" rows="6" cols="20">Input comes here</textarea> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="submit" /> - </td> - </tr> - </table> - </form> - <span wicket:id="feedback">feedbackmessages will be put here</span> - </p> + <div class="row"> + <div class="col-sm-offset-1 col-sm-3"> + <form wicket:id="form" class="form-horizontala" role="form"> + <div class="form-group"> + <label wicket:for="text">multiple lines of text</label> + <textarea wicket:id="text" class="form-control" rows="6" cols="20">Input comes here</textarea> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default">Submit</button> + </div> + </form> + </div> + </div> + <div wicket:id="feedback">feedbackmessages will be put here</div> <span wicket:id="explainPanel">panel contents come here</span> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java index 9549844..3ee341e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java @@ -16,12 +16,13 @@ */ package org.apache.wicket.examples.compref; -import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.CompoundPropertyModel; +import org.apache.wicket.util.io.IClusterable; + +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; /** @@ -40,7 +41,7 @@ public class TextAreaPage extends WicketExamplePage setDefaultModel(new CompoundPropertyModel<>(input)); // Add a FeedbackPanel for displaying our messages - FeedbackPanel feedbackPanel = new FeedbackPanel("feedback"); + NotificationPanel feedbackPanel = new NotificationPanel("feedback"); add(feedbackPanel); // Add a form with an onSumbit implementation that sets a message @@ -86,4 +87,4 @@ public class TextAreaPage extends WicketExamplePage add(new ExplainPanel(html, code)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/63c909c4/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..a4565d8 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> @@ -15,28 +15,26 @@ update their models as well as they read them it, and you can attach validations (instances of IValidator) to them. </p> - <p> - <form wicket:id="form"> - - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> - <tr> - <td>some plain text</td> - <td><input type="text" wicket:id="text" /></td> - </tr> - <tr> - <td>an integer value</td> - <td><input type="text" wicket:id="integer" /></td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="submit" /> - </td> - </tr> - </table> + <div class="row"> + <div class="col-sm-offset-1 col-sm-3"> + <form wicket:id="form" class="form-horizontala" role="form"> + <div class="form-group"> + <label wicket:for="text">some plain text</label> + <input type="text" class="form-control" wicket:id="text"/> + </div> + <div class="form-group"> + <label wicket:for="integer">an integer value</label> + <input type="text" class="form-control" wicket:id="integer" /> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default">Submit</button> + </div> + </form> + </div> + </div> + <div wicket:id="feedback">feedbackmessages will be put here</div> + <span wicket:id="explainPanel">panel contents come here</span> - </form> - <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/63c909c4/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java index 3ed2bf7..d9600b8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.examples.compref; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.form.Form; @@ -53,7 +54,7 @@ public class TextFieldPage extends WicketExamplePage setDefaultModel(new CompoundPropertyModel<>(input)); // Add a FeedbackPanel for displaying our messages - FeedbackPanel feedbackPanel = new FeedbackPanel("feedback"); + NotificationPanel feedbackPanel = new NotificationPanel("feedback"); add(feedbackPanel); // Add a form with an onSumbit implementation that sets a message @@ -152,4 +153,4 @@ public class TextFieldPage extends WicketExamplePage } -} \ No newline at end of file +}
