WICKET-3435 Revamp Wicket Examples with the new website L&F
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/78032475 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/78032475 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/78032475 Branch: refs/heads/3435-use-bootstrap-for-examples Commit: 780324757704fc16107528d5fa47fcdfec065dd1 Parents: 6337fb9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Nov 29 21:16:48 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Nov 29 21:16:48 2014 +0100 ---------------------------------------------------------------------- .../examples/ExampleApplicationConfigurer.java | 27 +++++ .../examples/WicketExampleApplication.java | 14 +-- .../wicket/examples/ajax/prototype/Index.html | 17 +-- .../ajaxhellobrowser/AjaxHelloBrowser.html | 7 +- .../wicket/examples/asemail/MailTemplate.html | 21 ++-- .../wicket/examples/asemail/MailTemplate.java | 26 ----- .../asemail/MailTemplateApplication.java | 6 +- .../wicket/examples/authentication1/Home.html | 6 +- .../wicket/examples/authentication1/SignIn.html | 22 ++-- .../wicket/examples/authentication1/SignIn.java | 5 +- .../examples/authentication1/SignOut.html | 3 +- .../wicket/examples/authentication2/Home.html | 5 +- .../examples/authentication2/SignIn2.html | 5 +- .../examples/authentication2/SignOut.html | 3 +- .../examples/authentication3/BasePage.html | 5 +- .../MyAuthenticatedWebApplication.java | 15 +-- .../examples/authentication3/MySignInPage.html | 5 +- .../examples/authentication3/SignOut.html | 3 +- .../wicket/examples/authorization/BasePage.html | 5 +- .../authorization/RolesApplication.java | 13 +-- .../breadcrumb/BreadCrumbApplication.java | 18 +-- .../wicket/examples/breadcrumb/FirstPanel.html | 4 +- .../wicket/examples/breadcrumb/FourthPanel.html | 2 +- .../wicket/examples/breadcrumb/Index.html | 5 +- .../wicket/examples/breadcrumb/ResultPanel.html | 2 +- .../wicket/examples/breadcrumb/SecondPanel.html | 27 +++-- .../wicket/examples/breadcrumb/ThirdPanel.html | 2 +- .../examples/captcha/AbstractCaptchaForm.html | 14 +-- .../apache/wicket/examples/captcha/Captcha.html | 10 +- .../CustomLoadedTemplate.html | 33 +++--- .../examples/customresourceloading/Index.html | 5 +- .../PageFromWebContext.java | 8 +- .../PageWithCustomLoading.java | 20 ++-- .../apache/wicket/examples/dates/DatesPage.html | 82 +++++++++----- .../org/apache/wicket/examples/frames/Home.html | 2 +- .../apache/wicket/examples/frames/TopFrame.html | 6 +- .../apache/wicket/examples/frames/TopFrame.java | 8 +- .../wicket/examples/guestbook/GuestBook.html | 46 ++++---- .../apache/wicket/examples/hangman/Guess.html | 8 +- .../apache/wicket/examples/hangman/Home.html | 3 +- .../apache/wicket/examples/hangman/Lose.html | 4 +- .../org/apache/wicket/examples/hangman/Win.html | 3 +- .../examples/hellobrowser/HelloBrowser.html | 3 +- .../wicket/examples/kittenCaptcha/HomePage.html | 3 +- .../kittenCaptcha/KittenCaptchaApplication.java | 34 ++++++ .../kittenCaptcha/WicketApplication.java | 56 ---------- .../examples/library/AuthenticatedWebPage.html | 24 ++-- .../wicket/examples/library/BookDetails.html | 15 +-- .../wicket/examples/library/BookDetails.java | 4 +- .../wicket/examples/library/EditBook.html | 14 +-- .../apache/wicket/examples/library/SignIn.html | 7 +- .../apache/wicket/examples/library/SignIn.java | 9 +- .../apache/wicket/examples/library/SignOut.html | 3 +- .../apache/wicket/examples/stateless/Index.html | 29 ++--- .../wicket/examples/stateless/StatefulPage.html | 28 ++--- .../wicket/examples/stateless/StatefulPage.java | 7 +- .../examples/stateless/StatelessPage.html | 25 +++-- .../examples/stateless/StatelessPage.java | 7 +- .../examples/stateless/StatelessPage1.html | 26 +++-- .../examples/stateless/StatelessPage1.java | 7 +- .../examples/stateless/StatelessPage2.html | 27 +++-- .../examples/stateless/StatelessPage2.java | 10 +- .../examples/stateless/StatelessPage3.html | 25 +++-- .../examples/stateless/StatelessPage3.java | 7 +- .../stockquote/StockQuoteApplication.java | 11 -- .../examples/stockquote/StockQuotePage.html | 9 +- .../apache/wicket/examples/template/Index.html | 3 +- .../apache/wicket/examples/template/Index.java | 8 +- .../wicket/examples/template/border/Page1.html | 9 +- .../wicket/examples/template/border/Page1.java | 5 +- .../wicket/examples/template/border/Page2.html | 4 +- .../template/border/TemplateBorder.html | 47 ++++---- .../template/pageinheritance/TemplatePage.html | 50 ++++----- .../template/pageinheritance/TemplatePage.java | 1 - .../wicket/examples/upload/MultiUploadPage.html | 38 +++---- .../wicket/examples/upload/MultiUploadPage.java | 5 +- .../wicket/examples/upload/UploadPage.html | 112 +++++++++++-------- .../wicket/examples/upload/UploadPage.java | 11 +- .../apache/wicket/examples/wizard/Index.html | 11 +- .../wizard/NewUserWizard$UserDetailsStep.html | 46 +++++--- .../wicket/examples/wizard/NewUserWizard.java | 5 +- .../examples/wizard/WizardApplication.java | 18 +-- .../wicket/examples/wizard/WizardPage.html | 3 +- .../AlternativePageFromWebContext.html | 3 +- .../PageFromWebContext.html | 3 +- wicket-examples/src/main/webapp/WEB-INF/web.xml | 2 +- 86 files changed, 631 insertions(+), 668 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationConfigurer.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationConfigurer.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationConfigurer.java new file mode 100644 index 0000000..81005ef --- /dev/null +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationConfigurer.java @@ -0,0 +1,27 @@ +package org.apache.wicket.examples; + +import de.agilecoders.wicket.core.Bootstrap; +import de.agilecoders.wicket.core.settings.BootstrapSettings; +import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme; +import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider; +import net.ftlines.wicketsource.WicketSource; +import org.apache.wicket.Application; +import org.apache.wicket.protocol.http.WebApplication; + +/** + * + */ +public class ExampleApplicationConfigurer +{ + public static void configure(WebApplication application) + { + + if (application.usesDevelopmentConfig()) { + WicketSource.configure(application); + } + + BootstrapSettings bootstrapSettings = new BootstrapSettings(); + bootstrapSettings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly)); + Bootstrap.install(application, bootstrapSettings); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java index 3c00fbe..bfe11c9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java @@ -47,6 +47,8 @@ public abstract class WicketExampleApplication extends WebApplication @Override protected void init() { + super.init(); + // WARNING: DO NOT do this on a real world application unless // you really want your app's passwords all passed around and // stored in unencrypted browser cookies (BAD IDEA!)!!! @@ -56,16 +58,8 @@ public abstract class WicketExampleApplication extends WebApplication // and we want them to be able to run the examples out of the // box. getSecuritySettings().setCryptFactory( - new ClassCryptFactory(NoCrypt.class, SecuritySettings.DEFAULT_ENCRYPTION_KEY)); - - getDebugSettings().setDevelopmentUtilitiesEnabled(true); - - if (usesDevelopmentConfig()) { - WicketSource.configure(this); - } + new ClassCryptFactory(NoCrypt.class, SecuritySettings.DEFAULT_ENCRYPTION_KEY)); - BootstrapSettings bootstrapSettings = new BootstrapSettings(); - bootstrapSettings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly)); - Bootstrap.install(this, bootstrapSettings); + ExampleApplicationConfigurer.configure(this); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html index 1c0c99e..06bb3e6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html @@ -1,17 +1,18 @@ <html xmlns:wicket="http://wicket.apache.org";> -<head> - <title>Wicket Examples - Prototype.js / component render</title> +<wicket:head> + <!--<title>Wicket Examples - Prototype.js / component render</title>--> <script type="text/javascript" src="prototype.js"></script> - <link rel="stylesheet" type="text/css" href="style.css"/> -</head> +</wicket:head> <body> - <span wicket:id="mainNavigation"/> - <p>Counting link using Ajax: <a href="#" wicket:id="link">Click me!</a></p> +<wicket:extend> + <p>Counting link using Ajax: <a wicket:id="link" class="btn btn-link">Click me!</a></p> <!-- the wicket component is enclosed in a span tag with a separate markup ID attribute --> <!-- because Wicket returns the whole <span wicket:id="counter>XYZ</span> markup. The --> <!-- updater only replaces the contents of the tags, not the tags itself. --> - <p>Link was clicked <span id="counter"><span wicket:id="counter">-100</span></span> times.</p> + <p>Link was clicked <span id="counter" wicket:id="counter">-100</span> times.</p> + +</wicket:extend> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html index 5c88266..6506ccc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.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 - hellobrowser</title> - <!--<link rel="stylesheet" type="text/css" href="style.css"/>--> -</head> <body> - <div wicket:id="mainNavigation"></div> +<wicket:extend> <p> This page uses <em>org.apache.wicket.ajax.AjaxClientInfoBehavior</em> @@ -17,5 +13,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/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html index 75761c6..e35b20a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html @@ -4,14 +4,19 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> - - <div wicket:id="feedback"></div> - - <form wicket:id="form"> - <label wicket:for="name"><wicket:label>Enter your name:</wicket:label></label><input wicket:id="name"/> +<wicket:extend> + + <form wicket:id="form" style="padding-bottom: 100px"> + <div class="form-group"> + <div class="col-sm-4"> + <label wicket:for="name"><wicket:label>Enter your name:</wicket:label></label> + <input wicket:id="name" class="form-control"/> + </div> + </div> </form> - + + <div class="clearfix"></div> + Using Wicket page as template: <a wicket:id="pageBasedLink">generate</a>. <br/> Using Wicket panel as template: <a wicket:id="panelBasedLink">generate</a>. @@ -24,6 +29,6 @@ <div wicket:id="result" id="result"> </div> - +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java index 6042505..4f0c7e4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java @@ -29,7 +29,6 @@ import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.basic.MultiLineLabel; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -62,10 +61,6 @@ public class MailTemplate extends WicketExamplePage { super(parameters); - final FeedbackPanel feedback = new FeedbackPanel("feedback"); - feedback.setOutputMarkupId(true); - add(feedback); - final Form<Void> form = new Form<>("form"); add(form); @@ -91,13 +86,6 @@ public class MailTemplate extends WicketExamplePage CharSequence pageHtml = ComponentRenderer.renderPage(pageProvider); updateResult(result, pageHtml, target); - target.add(feedback); - } - - @Override - protected void onError(AjaxRequestTarget target, Form<?> form) - { - target.add(feedback); } }; @@ -112,13 +100,6 @@ public class MailTemplate extends WicketExamplePage new PropertyModel<String>(MailTemplate.this, "name"))); updateResult(result, panelHtml, target); - target.add(feedback); - } - - @Override - protected void onError(AjaxRequestTarget target, Form<?> form) - { - target.add(feedback); } }; @@ -141,13 +122,6 @@ public class MailTemplate extends WicketExamplePage PackageTextTemplate template = new PackageTextTemplate(MailTemplate.class, "mail-template.tmpl"); CharSequence templateHtml = template.asString(variables); updateResult(result, templateHtml, target); - target.add(feedback); - } - - @Override - protected void onError(AjaxRequestTarget target, Form<?> form) - { - target.add(feedback); } }; http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplateApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplateApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplateApplication.java index d716ced..91b899d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplateApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplateApplication.java @@ -17,18 +17,16 @@ package org.apache.wicket.examples.asemail; import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.examples.WicketExampleApplication; /** * */ -public class MailTemplateApplication extends WebApplication +public class MailTemplateApplication extends WicketExampleApplication { - @Override public Class<? extends Page> getHomePage() { return MailTemplate.class; } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html index f1b35c6..36e50fb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html @@ -4,9 +4,11 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Welcome!</h2> - <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link> + <wicket:link><a href="SignOut.html" class="btn btn-default">Sign Out</a></wicket:link> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html index 89a713d..77b3b34 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html @@ -4,7 +4,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <span wicket:id = "feedback"/> <p> @@ -12,15 +12,19 @@ </p> <form wicket:id="signInForm"> - <dl> - <dt>Username:</dt> - <dd><input wicket:id="username" type="text" size="30"/></dd> - <dt>Password:</dt> - <dd><input wicket:id="password" type="password" size="30"/></dd> - <dd> - <input type="submit" name="submit" value="Sign In"/> - </dd> + <dl class="form-group"> + <div class="col-sm-3"> + <dt>Username:</dt> + <dd><input wicket:id="username" type="text" size="30" class="form-control"/></dd> + <dt>Password:</dt> + <dd><input wicket:id="password" type="password" size="30" class="form-control"/></dd> + <dd> + <button type="submit" name="submit" class="btn btn-primary">Sign In</button> + </dd> + </div> </dl> </form> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java index 5b4446d..e0b56c1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.java @@ -20,10 +20,11 @@ import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.value.ValueMap; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; + /** * Simple example of a sign in page. Even simpler, as shown in the authentication-2 example, is @@ -40,7 +41,7 @@ public final class SignIn extends WicketExamplePage public SignIn() { // Create feedback panel and add to page - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); // Add sign-in form to page add(new SignInForm("signInForm")); http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html index 8ad4d4c..796acfc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html @@ -4,8 +4,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Goodbye!</h2> <wicket:link><a href="Home.html">Home</a></wicket:link> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html index e2567b4..716f795 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html @@ -4,8 +4,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Welcome!</h2> - <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link> + <wicket:link><a href="SignOut.html" class="btn btn-default">Sign Out</a></wicket:link> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html index 196df83..9495d85 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html @@ -4,10 +4,11 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p> <i>Username and password are both "wicket"</i> </p> - <span wicket:id="signInPanel"/> + <span wicket:id="signInPanel"></span> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html index 3867ad8..741dc61 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html @@ -4,8 +4,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Goodbye!</h2> <wicket:link><a href="Home.html">Home</a></wicket:link> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html index d8821c4..226a749 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html @@ -4,7 +4,8 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <wicket:child/> +</wicket:extend> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java index 7d60e94..248e27d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java @@ -19,6 +19,7 @@ package org.apache.wicket.examples.authentication3; import org.apache.wicket.Page; import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession; import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; +import org.apache.wicket.examples.ExampleApplicationConfigurer; import org.apache.wicket.markup.html.WebPage; @@ -29,40 +30,28 @@ import org.apache.wicket.markup.html.WebPage; */ public class MyAuthenticatedWebApplication extends AuthenticatedWebApplication { - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return HomePage.class; } - /** - * @see org.apache.wicket.authentication.AuthenticatedWebApplication#getWebSessionClass() - */ @Override protected Class<? extends AbstractAuthenticatedWebSession> getWebSessionClass() { return MyAuthenticatedWebSession.class; } - /** - * @see org.apache.wicket.authentication.AuthenticatedWebApplication#getSignInPageClass() - */ @Override protected Class<? extends WebPage> getSignInPageClass() { return MySignInPage.class; } - /** - * @see org.apache.wicket.authentication.AuthenticatedWebApplication#init() - */ @Override protected void init() { super.init(); - getDebugSettings().setDevelopmentUtilitiesEnabled(true); + ExampleApplicationConfigurer.configure(this); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html index 196df83..9495d85 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html @@ -4,10 +4,11 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p> <i>Username and password are both "wicket"</i> </p> - <span wicket:id="signInPanel"/> + <span wicket:id="signInPanel"></span> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html index 97ff9ed..d8d8ff3 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html @@ -4,8 +4,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Goodbye!</h2> <wicket:link><a href="HomePage.html">Home</a></wicket:link> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html index d0fbf8f..1eab82c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html @@ -4,7 +4,8 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <wicket:child/> +</wicket:extend> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java index 3c5cbfe..b9d3f79 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java @@ -23,9 +23,9 @@ import org.apache.wicket.Page; import org.apache.wicket.Session; import org.apache.wicket.authroles.authorization.strategies.role.RoleAuthorizationStrategy; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.examples.WicketExampleApplication; import org.apache.wicket.examples.authorization.pages.AdminBookmarkablePage; import org.apache.wicket.examples.authorization.pages.AdminInternalPage; -import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; @@ -35,7 +35,7 @@ import org.apache.wicket.request.Response; * * @author Eelco Hillenius */ -public class RolesApplication extends WebApplication +public class RolesApplication extends WicketExampleApplication { /** * User DB. @@ -51,19 +51,12 @@ public class RolesApplication extends WebApplication super(); } - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Index.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket.request.Request, - * org.apache.wicket.request.Response) - */ @Override public Session newSession(Request request, Response response) { @@ -75,8 +68,6 @@ public class RolesApplication extends WebApplication { super.init(); - getDebugSettings().setDevelopmentUtilitiesEnabled(true); - getSecuritySettings().setAuthorizationStrategy( new RoleAuthorizationStrategy(new UserRolesAuthorizer())); MetaDataRoleAuthorizationStrategy.authorize(AdminBookmarkablePage.class, "ADMIN"); http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java index 03c40fe..045bac4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/BreadCrumbApplication.java @@ -17,32 +17,18 @@ package org.apache.wicket.examples.breadcrumb; import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.examples.WicketExampleApplication; /** * Application class for the bread crumb example. * * @author Eelco Hillenius */ -public class BreadCrumbApplication extends WebApplication +public class BreadCrumbApplication extends WicketExampleApplication { - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Index.class; } - - /** - * @see org.apache.wicket.protocol.http.WebApplication#init() - */ - @Override - protected void init() - { - super.init(); - - getDebugSettings().setDevelopmentUtilitiesEnabled(true); - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.html index 6fb6c98..e36f446 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.html @@ -1,5 +1,5 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <div style="border: thin solid black; margin 10px;"> + <div style="border: thin solid black; margin: 10px;"> Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur tincidunt tincidunt nibh. Fusce sed sapien in ipsum nonummy fringilla. Nullam vulputate, purus ac elementum mattis, neque magna ullamcorper odio, feugiat feugiat ligula sem ac dolor. Nulla eu pede in nisl bibendum dignissim. @@ -12,7 +12,7 @@ tellus et sollicitudin pulvinar, dolor quam rutrum elit, nec malesuada eros veli </div> <div style="margin: 10px;"> - <a href="#" wicket:id="linkToSecond">go to the second panel</a> + <a class="btn btn-link" wicket:id="linkToSecond">go to the second panel</a> </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.html index faed45d..7a9215d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.html @@ -1,5 +1,5 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <div style="border: thin solid black; margin 10px;"> + <div style="border: thin solid black; margin: 10px;"> Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur lacinia pede. Maecenas egestas molestie dui. Donec fringilla ullamcorper pede. Vivamus ultrices cursus elit. Nulla tristique mattis lectus. Suspendisse felis neque, tristique vitae, congue non, interdum ut, nisl. Nam egestas purus ac sem. Maecenas vitae nisi. Nam http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html index 8515f6a..9c8f9ba 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <div> <span wicket:id="breadCrumbBar">bar</span> @@ -15,5 +15,6 @@ <span wicket:id="panel">bar</span> </div> +</wicket:extend> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.html index 186f1ed..3509431 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.html @@ -1,6 +1,6 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <div style="border: thin solid black; margin 10px;"> + <div style="border: thin solid black; margin: 10px;"> The input you provided in the other panel: '<strong><span wicket:id="result">result here</span></strong>'. http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.html index d2a6eea..dc5308e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.html @@ -1,5 +1,5 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <div style="border: thin solid black; margin 10px;"> + <div style="border: thin solid black; margin: 10px;"> Donec consectetuer purus nec risus. Ut lobortis. Quisque ac arcu vel mi aliquam varius. Aliquam erat volutpat. Sed augue. Pellentesque sapien justo, pellentesque at, hendrerit nec, laoreet ac, sapien. Cras at risus. Suspendisse nulla mauris, vehicula nec, luctus non, @@ -11,20 +11,27 @@ Nunc accumsan, enim eu rutrum faucibus, massa leo luctus arcu, nonummy viverra e pede. Donec vel neque adipiscing nulla ultrices iaculis. </div> - <div style="margin: 10px;"> - <form wicket:id="form"> - input <input wicket:id="input" type="text" value="" />  - <input wicket:id="normalButton" type="submit" value="update" /> - <input wicket:id="nextButton" type="submit" value="update and display result panel" /> - </form> + <div style="margin: 10px;" class="row"> + <div class="col-sm-4"> + <form wicket:id="form"> + <div class="form-group"> + <label wicket:for="input">input</label> + <input wicket:id="input" type="text" class="form-control" /> + </div> + + <input wicket:id="normalButton" type="submit" value="update" class="btn btn-default" /> + <input wicket:id="nextButton" type="submit" value="update and display result panel" class="btn btn-primary" /> + </form> + </div> + </div> - + <div style="margin: 10px;"> - <a href="#" wicket:id="linkToThird">go to the third panel</a> + <a class="btn btn-link" wicket:id="linkToThird">go to the third panel</a> </div> <div style="margin: 10px;"> - <a href="#" wicket:id="linkToFourth">go to the fourth panel</a> + <a class="btn btn-link" wicket:id="linkToFourth">go to the fourth panel</a> </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.html index 55780c8..2d5eb49 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.html @@ -1,5 +1,5 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <div style="border: thin solid black; margin 10px;"> + <div style="border: thin solid black; margin: 10px;"> Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis sapien nisl, suscipit quis, suscipit id, mollis sed, turpis. In a libero. Nunc blandit, sapien at aliquet venenatis, tellus pede rhoncus purus, non ultrices tortor felis ac purus. Maecenas adipiscing. Ut id turpis. Vestibulum posuere convallis est. http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/AbstractCaptchaForm.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/AbstractCaptchaForm.html b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/AbstractCaptchaForm.html index 504d52f..847b9b9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/AbstractCaptchaForm.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/AbstractCaptchaForm.html @@ -6,15 +6,15 @@ <form wicket:id="form"> <p> <img wicket:id="image" /> - <a wicket:id="changeLink">change</a> - </p> - <p> - Please replicate the text you see above - <br /> - <input wicket:id="text" type="text" size="40" /> - <input type="submit" value="submit" /> + <a wicket:id="changeLink" class="btn btn-default btn-sm">change</a> </p> + Please replicate the text you see above + <div class="form-group"> + <input wicket:id="text" type="text" size="40" class="form-control" style="width: 300px" /> + </div> + <input type="submit" value="submit" class="btn btn-primary" /> + <div wicket:id="feedback"></div> </form> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html index 49daadc..62ab93b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html @@ -1,13 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org"; xml:lang="en" lang="en"> <head> - <title>Wicket Examples - Captcha</title> - <link rel="stylesheet" type="text/css" href="style.css" /> + <!--<title>Wicket Examples - Captcha</title>--> </head> <body> - <span wicket:id="mainNavigation" /> + <wicket:extend> <h3>Demo of Wicket's default: <em>org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource</em> </h3> <wicket:container wicket:id="wicket"></wicket:container> @@ -21,6 +19,6 @@ <h3>Demo using <a href="https://github.com/akiraly/cage";>Cage</a> library</h3> <wicket:container wicket:id="cage"></wicket:container> - + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..3994e22 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 @@ -2,23 +2,24 @@ <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"/> - <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 class="container-fluid"> + <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> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..dc54601 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <ul> <wicket:link> <li> @@ -18,8 +18,9 @@ </li> </wicket:link> <li> - <a href="#" wicket:id="customLoadingPageLink">Go to a page that which template is loaded by itself.</a> + <a 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/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java index ef24b0a..2b3e062 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java @@ -28,10 +28,4 @@ import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator; */ public class PageFromWebContext extends WicketExamplePage { - /** - * Constructor - */ - public PageFromWebContext() - { - } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java index e80485d..589d702 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java @@ -18,12 +18,15 @@ package org.apache.wicket.examples.customresourceloading; import java.net.URL; +import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.examples.WicketExamplePage; +import org.apache.wicket.core.util.resource.UrlResourceStream; +import org.apache.wicket.examples.WicketExampleHeader; import org.apache.wicket.markup.IMarkupCacheKeyProvider; import org.apache.wicket.markup.IMarkupResourceStreamProvider; +import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; -import org.apache.wicket.core.util.resource.UrlResourceStream; +import org.apache.wicket.util.string.Strings; /** @@ -34,16 +37,17 @@ import org.apache.wicket.core.util.resource.UrlResourceStream; * * @author Eelco Hillenius */ -public class PageWithCustomLoading extends WicketExamplePage +public class PageWithCustomLoading extends WebPage implements IMarkupResourceStreamProvider, IMarkupCacheKeyProvider { - /** - * Constructor - */ public PageWithCustomLoading() { + final String packageName = getClass().getPackage().getName(); + add(new WicketExampleHeader("mainNavigation", Strings.afterLast(packageName, '.'), this)); + + BootstrapBaseBehavior.addTo(this); } /** @@ -79,7 +83,7 @@ public class PageWithCustomLoading extends WicketExamplePage * {@link IMarkupCacheKeyProvider} will just have their markup cached - but is useful when * markup varies. If you don't need such dynamic loading, it is advisible to not implement * {@link IMarkupCacheKeyProvider}. - * + * * @see org.apache.wicket.markup.IMarkupCacheKeyProvider#getCacheKey(org.apache.wicket.MarkupContainer, * java.lang.Class) */ @@ -88,4 +92,4 @@ public class PageWithCustomLoading extends WicketExamplePage { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.html index ad22d67..e4fb55e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.html @@ -10,38 +10,66 @@ </style> </head> <body> - <span wicket:id="mainNavigation"></span> + <wicket:extend> + <form wicket:id="localeForm"> - <p><select wicket:id="localeSelect" /> [<a href="#" - wicket:id="localeUSLink">set to english</a>]</p> + <div class="form-group"> + <div class="col-sm-2"> + <select wicket:id="localeSelect" class="form-control"></select> + </div> + <div class="col-sm-1"> + [<a wicket:id="localeUSLink">set to english</a>] + </div> + </div> </form> - <p> - Example using DateTextField (auto-hides the picker when clicking on the document):  - <form wicket:id="form"><input type="text" - wicket:id="dateTextField" /> <input type="submit" value="submit" /></form> - </p> - - <br/> - <p> - Example using DateTimeField:  + + <div class="clearfix"></div> + <hr/> + + <h5>Example using DateTextField (auto-hides the picker when clicking on the document):</h5> + <form wicket:id="form"> + <div class="form-group"> + <div class="col-sm-2"> + <input type="text" class="form-control" wicket:id="dateTextField" /> + </div> + <div class="col-sm-2"> + <input class="btn btn-xs btn-default" type="submit" value="submit" /> + </div> + </div> + </form> + + <div class="clearfix"></div> + <hr/> + + <h5>Example using DateTimeField:</h5> <form wicket:id="form2"> - <span wicket:id="dateTimeField"></span> - <input type="submit" value="submit" /> + <div class="form-group"> + <div class="col-sm-2"> + <input type="text" class="form-control" wicket:id="dateTimeField" /> + </div> + <div class="col-sm-2"> + <input class="btn btn-xs btn-default" type="submit" value="submit" /> + </div> + </div> </form> - </p> - - <br/> - <p> - Example using TimeField:  + + <div class="clearfix"></div> + <hr/> + + <h5>Example using TimeField:</h5> <form wicket:id="form3"> - <span wicket:id="timeField"></span> - <input type="submit" value="submit" /> + <div class="form-group"> + <div class="col-sm-2"> + <input type="text" class="form-control" wicket:id="timeField" /> + </div> + <div class="col-sm-2"> + <input class="btn btn-xs btn-default" type="submit" value="submit" /> + </div> + </div> </form> - </p> - - <p> - <div wicket:id="feedback"></div> - </p> - + + <div wicket:id="feedback"></div> + + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.html index db5191e..74baf3e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.html @@ -1,4 +1,4 @@ -<frameset rows="140px, *" name="master" xmlns:wicket="http://wicket.apache.org";> +<frameset rows="260px, *" name="master" xmlns:wicket="http://wicket.apache.org";> <frame wicket:id="topFrame" name="top" /> <frame wicket:id="bodyFrame" name="body" /> </frameset> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..51b882c 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 @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <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/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java index ad1c513..7511db7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java @@ -25,10 +25,4 @@ import org.apache.wicket.examples.WicketExamplePage; */ public class TopFrame extends WicketExamplePage { - /** - * Constructor - */ - public TopFrame() - { - } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..96343e8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html @@ -4,29 +4,29 @@ <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: - <p> - <textarea wicket:id = "text">This is a comment</textarea> - </p> - <input type="text" wicket:id="comment" class="nospam" onfocus="getElementById('formsubmit').focus();"/> - <br /> - <input type = "submit" value = "Submit" id="formsubmit"/> - </form> - <p/> - <span wicket:id = "comments" id="comments"> - <p> - <span wicket:id="date">1/1/2004</span><br /> - <span wicket:id="text">Comment text goes here.</span> - </p> - </span> - <wicket:remove> - <p> - 1/2/2004<br/> - More comment text here. - </p> - </wicket:remove> + <div style="width: 300px"> + + <form wicket:id="commentForm"> + <label wicket:for="text">Add your comment here:</label> + <textarea wicket:id = "text" class="form-control">This is a comment</textarea> + <input type="text" wicket:id="comment" class="hide" onfocus="getElementById('formsubmit').focus();"/> + <br /> + <input type="submit" value = "Submit" id="formsubmit" class="btn btn-primary"/> + </form> + + <p/> + + <div class="list-group"> + <div class="list-group-item" wicket:id="comments" id="comments"> + <span wicket:id="date">1/1/2004</span><br /> + <span wicket:id="text">Comment text goes here.</span> + </div> + </div> + + </div> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..bf1d637 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,10 @@ -<html xmlns:wicket="http://wicket.apache.org/wicket";> +<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"></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 +14,7 @@ </span> </div> </p> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..c7303b6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html @@ -4,7 +4,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p>This software plays a game of hangman. <br /> A word is chosen at random and displayed as a series of blanks. @@ -12,5 +12,6 @@ You then have 5 opportunities to pick letters from the list of available letters. </p> <p><a wicket:id="start" id="start" href="#">Start Hangman</a></p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..651ca08 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/78032475/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..3c54ecf 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html @@ -4,9 +4,10 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p>Congratulations! You guessed that the word was <b><span wicket:id="currentWord">summer</span></b> with <span wicket:id="guessesRemaining">3</span> remaining guesses.</p> <p><a wicket:id="playAgain">Play again</a>.</p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..9ec317a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p> Hi there. We have been snooping around your browser, even doing a sneaky @@ -18,5 +18,6 @@ <span wicket:id="clienttime">client time info here</span> </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..7c23802 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html @@ -6,10 +6,11 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <div style="font-family: helvetica" wicket:id="captcha"></div> <p/> <a wicket:id="checkKittens">Check kittens!</a> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/KittenCaptchaApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/KittenCaptchaApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/KittenCaptchaApplication.java new file mode 100644 index 0000000..f3d1b78 --- /dev/null +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/KittenCaptchaApplication.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.examples.kittenCaptcha; + +import org.apache.wicket.Page; +import org.apache.wicket.examples.WicketExampleApplication; + +/** + * Application object for your web application. If you want to run this application without + * deploying, run the Start class. + * + */ +public class KittenCaptchaApplication extends WicketExampleApplication +{ + @Override + public Class<? extends Page> getHomePage() + { + return HomePage.class; + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java deleted file mode 100644 index 7053a76..0000000 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.examples.kittenCaptcha; - -import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; - -/** - * Application object for your web application. If you want to run this application without - * deploying, run the Start class. - * - */ -public class WicketApplication extends WebApplication -{ - /** - * Constructor - */ - public WicketApplication() - { - } - - /** - * - * @see org.apache.wicket.Application#getHomePage() - */ - @Override - public Class<? extends Page> getHomePage() - { - return HomePage.class; - } - - /** - * @see org.apache.wicket.protocol.http.WebApplication#init() - */ - @Override - protected void init() - { - super.init(); - - getDebugSettings().setDevelopmentUtilitiesEnabled(true); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..37284fa 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 @@ -4,17 +4,17 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> +<wicket:extend> + <div> + <wicket:link><a href="Home.html">Home</a></wicket:link> +   + <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link> + <br/> + <div style="border:1px solid gray; overflow: hidden; padding: 1em;"> + <wicket:child/> + </div> + </div> - <span wicket:id="mainNavigation" /> - - <p> - <wicket:link><a href = "Home.html">Home</a></wicket:link>  - <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link> - <br /> - <div style="border:1px solid gray; overflow: hidden; padding: 1em;"> - <wicket:child/> - </div> - </p> - +</wicket:extend> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html index 22c311d..69e23cc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html @@ -1,21 +1,12 @@ <wicket:extend xmlns:wicket="http://wicket.apache.org";> -<style type="text/css"> -<!-- -.italic { - font-style: italic; -} ---> -</style> - - Book Details <p></p> <table> <tr> <td align="right">Title:</td> <td> - <span wicket:id = "title"> + <span wicket:id = "bookTitle"> Huckleberry Finn </span> </td> @@ -23,7 +14,7 @@ <tr> <td align="right">Author:</td> <td> - <span wicket:id = "author"> + <span wicket:id = "bookAuthor"> Mark Twain </span> </td> @@ -64,4 +55,4 @@ <div style="margin-top: 1em"> <a wicket:id = "edit" href="EditBook.html">Edit</a> </div> -</wicket:extend> \ No newline at end of file +</wicket:extend> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java index e3ccb58..72373ad 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java @@ -55,8 +55,8 @@ public final class BookDetails extends AuthenticatedWebPage */ public BookDetails(final Book book) { - add(new Label("title", book.getTitle())); - add(new Label("author", book.getAuthor())); + add(new Label("bookTitle", book.getTitle())); + add(new Label("bookAuthor", book.getAuthor())); add(new Label("fiction", Boolean.toString(book.getFiction()))); add(BookDetails.link("companion", book.getCompanionBook(), getLocalizer().getString("noBookTitle", this))); http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html index 0f8c53c..87a436d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html @@ -1,18 +1,18 @@ <wicket:extend xmlns:wicket="http://wicket.apache.org";> - <span wicket:id = "feedback"/> + <div wicket:id = "feedback"></div> <p> - <form wicket:id = "editBookForm"> + <form wicket:id = "editBookForm" style="width: 300px"> <table cellpadding="3"> <tr> <td align="right">Title:</td> - <td wicket:id = "titleFeedback"> - <input wicket:id = "title" type="text" value="Huckleberry Finn" size="30"/> + <td wicket:id="titleFeedback"> + <input wicket:id="title" type="text" value="Huckleberry Finn" size="30"/> </td> </tr> <tr> <td align="right">Author:</td> - <td wicket:id = "authorFeedback"> - <input wicket:id = "author" type="text" value="Mark Twain" hidden="1" size="30"/> + <td wicket:id="authorFeedback"> + <input wicket:id="author" type="text" value="Mark Twain" hidden="1" size="30"/> </td> </tr> <tr> @@ -64,4 +64,4 @@ </table> </form> </p> -</wicket:extend> \ No newline at end of file +</wicket:extend> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..aee2f58 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 @@ -4,12 +4,11 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - - <span wicket:id = "mainNavigation"/> +<wicket:extend> <p> <i>Username and password are both "wicket"</i> </p> - <span wicket:id = "signInPanel"/> - + <div wicket:id="signInPanel"></div> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java index a87d721..762206c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java @@ -30,20 +30,13 @@ public final class SignIn extends WicketExamplePage { /** * Constructor - */ - public SignIn() - { - this(null); - } - - /** - * Constructor * * @param parameters * The page parameters */ public SignIn(final PageParameters parameters) { + success(parameters); add(new SignInPanel("signInPanel", false)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/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..796acfc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html @@ -4,8 +4,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h2>Goodbye!</h2> <wicket:link><a href="Home.html">Home</a></wicket:link> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html index 4c4a4fb..635bbd0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html @@ -5,19 +5,20 @@ <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation"/> - <span wicket:id="message" id="message">Message goes here</span> - <br /> - <a wicket:id="linkToStatelessPage" href="#">go to another default stateless page</a> - <br /> - <a wicket:id="linkToStatelessPage1" href="#">go to another query strategy mounted stateless page</a> - <br /> - <a wicket:id="linkToStatelessPage2" href="#">go to another mixed strategy mounted stateless page</a> - <br /> - <a wicket:id="linkToStatelessPage3" href="#">Stateless page that stores state in URL</a> - <br /> - <a wicket:id="linkToStatefulPage" href="#">go to a stateful page (triggers session creation if not already done so)</a> - <br /> - <a wicket:id="invalidatesession" href="#">Invalidate the session</a> + <wicket:extend> + <span wicket:id="message" id="message">Message goes here</span> + <br /> + <a wicket:id="linkToStatelessPage" class="btn btn-link">go to another default stateless page</a> + <br /> + <a wicket:id="linkToStatelessPage1" class="btn btn-link">go to another query strategy mounted stateless page</a> + <br /> + <a wicket:id="linkToStatelessPage2" class="btn btn-link">go to another mixed strategy mounted stateless page</a> + <br /> + <a wicket:id="linkToStatelessPage3" class="btn btn-link">Stateless page that stores state in URL</a> + <br /> + <a wicket:id="linkToStatefulPage" class="btn btn-link">go to a stateful page (triggers session creation if not already done so)</a> + <br /> + <a wicket:id="invalidatesession" class="btn btn-link">Invalidate the session</a> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html index d71cd1b..4b34a2c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html @@ -5,10 +5,10 @@ <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation"/> + <wicket:extend> <span wicket:id="message" id="message">Message goes here</span> <br /> - <a wicket:id="indexLink" href="#">go to index</a> + <a wicket:id="indexLink" class="btn btn-link">go to index</a> <p> This page is stateful as it has a callback (the link that points to @@ -19,19 +19,21 @@ <p> This link is what makes this page stateful: <br /> - <a wicket:id="actionLink">Link clicked <span - wicket:id="linkClickCount">0</span> times</a> + <a wicket:id="actionLink">Link clicked <span wicket:id="linkClickCount">0</span> times</a> </p> + <div class="row"> + <div class="col-sm-4"> + <form wicket:id="statelessform"> + <div class="form-group"> + <input type="text" wicket:id="textfield" class="form-control" /> + </div> + <input type="submit" class="btn btn-primary" /> + </form> + </div> + </div> - <p> - <form wicket:id="statelessform"> - <input type="text" wicket:id="textfield" /> - <input type="submit" /> - </form> - </p> - <p> - <span wicket:id="feedback" /> - </p> + <div wicket:id="feedback" ></div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java index d1b0c33..df2b823 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java @@ -22,10 +22,11 @@ import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; + /** * Another page of the stateless example. * @@ -78,7 +79,7 @@ public class StatefulPage extends WicketExamplePage }; statelessForm.add(field); add(statelessForm); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } /** @@ -101,4 +102,4 @@ public class StatefulPage extends WicketExamplePage { this.linkClickCount = linkClickCount; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html index ce0166c..db84b8e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html @@ -5,15 +5,21 @@ <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation"/> + <wicket:extend> <span wicket:id="message" id="message">Message goes here</span> <br /> - <a wicket:id="indexLink" href="#">go to index</a> - - <form wicket:id="statelessform"> - <input type="text" wicket:id="textfield" /> - <input type="submit" /> - </form> + <a wicket:id="indexLink" class="btn btn-link">go to index</a> + + <div class="row"> + <div class="col-sm-4"> + <form wicket:id="statelessform"> + <div class="form-group"> + <input type="text" wicket:id="textfield" class="form-control" /> + </div> + <input type="submit" class="btn btn-primary" /> + </form> + </div> + </div> <p> This page is stateless as it doesn't have any callbacks (like statefull links or forms). @@ -23,9 +29,8 @@ is available, but is a temporary one. </p> - <p> - <span wicket:id="feedback" /> - </p> + <div wicket:id="feedback"></div> + </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java index 317a59e..7b609a6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java @@ -21,10 +21,11 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.validation.validator.RangeValidator; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; + /** * Another page of the stateless example. * @@ -64,7 +65,7 @@ public class StatelessPage extends WicketExamplePage }; statelessForm.add(field); add(statelessForm); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } -} \ No newline at end of file +}
