Repository: wicket Updated Branches: refs/heads/3435-use-bootstrap-for-examples 6337fb99f -> 780324757
http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html index 20b1f9a..a7e24a3 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html @@ -5,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,7 @@ 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/StatelessPage1.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java index eae6646..29ae897 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.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. * @@ -65,7 +66,7 @@ public class StatelessPage1 extends WicketExamplePage }; statelessForm.add(field); add(statelessForm); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } -} \ 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/StatelessPage2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html index 4c0f1c5..fef3c59 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html @@ -5,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). @@ -22,10 +28,9 @@ the actual session creation will be deferred. A Wicket session object 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/StatelessPage2.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java index db807bd..e514872 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.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. * @@ -32,9 +33,6 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage2 extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private final Integer number = 10; @@ -65,7 +63,7 @@ public class StatelessPage2 extends WicketExamplePage }; statelessForm.add(field); add(statelessForm); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } -} \ 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/StatelessPage3.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html index 4c0f1c5..0fc8d64 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html @@ -5,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/StatelessPage3.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java index 38e9735..7535c36 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.examples.stateless; +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.StatelessForm; @@ -33,9 +34,6 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage3 extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private Integer number; @@ -84,7 +82,6 @@ public class StatelessPage3 extends WicketExamplePage }; statelessForm.add(field); add(statelessForm); - add(new FeedbackPanel("feedback")); + add(new NotificationPanel("feedback")); } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java index 44a7d8e..03bee8a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java @@ -26,20 +26,9 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class StockQuoteApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public StockQuoteApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return StockQuotePage.class; } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html index d9f8a5e..7a9bbf6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.html @@ -5,8 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <!-- component for the examples application --> - <span wicket:id="mainNavigation"/> +<wicket:extend> <!-- first example --> <p> @@ -19,12 +18,14 @@ <!-- second example --> <p> <form wicket:id="form"> - Type symbol: <input wicket:id="symbol" type="text" /> - <input type="submit" /> + Type symbol: <input wicket:id="symbol" type="text" class="form-control" style="width: 200px; display: inline-block;" /> + <input type="submit" class="btn btn-default btn-sm" /> </form> <p> Stock quote of <span wicket:id="symbol">symbol</span> is <span wicket:id="quote">quote</span>. </p> </p> + +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html index c9d4407..fecc23c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> - <span wicket:id="mainNavigation" /> +<wicket:extend> <h1>Template example</h1> @@ -30,5 +30,6 @@ </wicket:link> </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/template/Index.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java index be219d5..171deec 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java @@ -25,10 +25,4 @@ import org.apache.wicket.examples.WicketExamplePage; */ public class Index extends WicketExamplePage { - /** - * Constructor - */ - public Index() - { - } -} \ 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/template/border/Page1.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html index 09634c7..6aff8f9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html @@ -1,13 +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:id="title">title comes here</title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <link rel="stylesheet" type="text/css" href="template/style.css"/> -</head> <body> - - <span wicket:id="mainNavigation"/> +<wicket:extend> <span wicket:id="border"> @@ -33,5 +27,6 @@ elit. Maecenas lacinia aliquet augue. </span><!-- end of border --> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java index 243b321..e8ecfa3 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.java @@ -17,8 +17,6 @@ package org.apache.wicket.examples.template.border; import org.apache.wicket.examples.WicketExamplePage; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.Model; /** @@ -33,7 +31,6 @@ public class Page1 extends WicketExamplePage */ public Page1() { - add(new Label("title", new Model<>("Template example, page 1 - border"))); add(new TemplateBorder("border")); } -} \ 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/template/border/Page2.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html index c39cbdf..ecf4cad 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html @@ -6,8 +6,7 @@ <link rel="stylesheet" type="text/css" href="template/style.css"/> </head> <body> - - <span wicket:id="mainNavigation"/> +<wicket:extend> <span wicket:id="border"> @@ -34,5 +33,6 @@ neque, fermentum accumsan, tincidunt at, suscipit eu, wisi. </span><!-- end of border --> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html index 6a47dad..238bb30 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html @@ -9,39 +9,32 @@ <wicket:border> - <div id="header" class="borderedBlock"> - <table width="100%"> - <tr> - <td id="ad"> - <span wicket:id="ad">ad comes here</span> - </td> - <td id="changeAddButton"> - <input type="button" wicket:id="changeAdLink" value="change ad" /> - </td> - </tr> - </table> + <div id="header" class="row"> + <div class="col-sm-2"> + <span wicket:id="ad">ad comes here</span> + </div> + <div class="col-sm-10"> + <input type="button" wicket:id="changeAdLink" value="change ad" class="btn btn-default" /> + </div> </div> - <table width="100%"> - - <tr> - <td id="left" class="borderedBlock"> - <ul> - <li><a href="#" wicket:id="page1Link">Page 1</a></li> - <li><a href="#" wicket:id="page2Link">Page 2</a></li> - </ul> - </td> - <td id="content" class="borderedBlock"> - <wicket:body /> - </td> - </tr> - - </table> + <div class="content row"> + <div class="col-sm-2"> + <ul> + <li><a href="#" wicket:id="page1Link">Page 1</a></li> + <li><a href="#" wicket:id="page2Link">Page 2</a></li> + </ul> + </div> + <div class="col-sm-10"> + <wicket:body/> + </div> + </div> <div id="footer" class="borderedBlock"> - footer + footer </div> + </wicket:border> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html index c4d776c..559b397 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html @@ -1,45 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -<head> - <title wicket:id="title">title comes here</title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <link rel="stylesheet" type="text/css" href="template/style.css"/> -</head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> - <div id="header" class="borderedBlock"> - <table width="100%"> - <tr> - <td id="ad"> - <span wicket:id="ad">ad comes here</span> - </td> - <td id="changeAddButton"> - <input type="button" wicket:id="changeAdLink" value="change ad" /> - </td> - </tr> - </table> + <div id="header" class="row"> + <div class="col-sm-2"> + <span wicket:id="ad">ad comes here</span> + </div> + <div class="col-sm-10"> + <input type="button" wicket:id="changeAdLink" value="change ad" class="btn btn-default" /> + </div> </div> - <table width="100%"> - - <tr> - <td id="left" class="borderedBlock"> - <ul> - <li><a href="#" wicket:id="page1Link">Page 1</a></li> - <li><a href="#" wicket:id="page2Link">Page 2</a></li> - </ul> - </td> - <td id="content" class="borderedBlock"> + <div class="content row"> + <div class="col-sm-2"> + <ul> + <li><a href="#" wicket:id="page1Link">Page 1</a></li> + <li><a href="#" wicket:id="page2Link">Page 2</a></li> + </ul> + </div> + <div class="col-sm-10"> <wicket:child /> - </td> - </tr> - - </table> + </div> + </div> <div id="footer" class="borderedBlock"> footer </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/template/pageinheritance/TemplatePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java index df53829..0434487 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java @@ -41,7 +41,6 @@ public abstract class TemplatePage extends WicketExamplePage */ public TemplatePage() { - add(new Label("title", new PropertyModel<>(this, "pageTitle"))); add(currentBanner = new Banner1("ad")); add(new Link("changeAdLink") { http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html index 4a97b42..161ddcd 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html @@ -12,7 +12,7 @@ </style> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p>The multi upload field is based on javascript found <a target="_blank" href="http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/";>here</a>.<br /><br /> Wicket can also handle file uploads via AJAX, please see AJAX examples section. AJAX Functionality is not included in this example to keep things simple.</p> @@ -24,28 +24,26 @@ <fieldset> <legend>Upload form</legend> <p> - <div wicket:id="fileInput" class="mfuex"/> + <div wicket:id="fileInput" class="mfuex"></div> </p> - <input type="submit" value="Upload!"/> + <input type="submit" value="Upload!" class="btn btn-primary"/> </fieldset> </form> - <div> - <span wicket:id="uploadFeedback"/> - </div> - - <div> - <h4>Current files in <span wicket:id="dir">(dir)</span>:</h4> - <table> - <tr wicket:id="fileList"> - <td width="200"><span wicket:id="file">(file)</span></td> - <td><a href="#" wicket:id="delete"><img src="delete.gif" border="0"/></a></td> - </tr> - </table> - </div> - - - - + <div wicket:id="uploadFeedback"></div> + + <div class="row"> + <div class="col-sm-4"> + <h4>Current files in <span wicket:id="dir">(dir)</span>:</h4> + <div class="list-group"> + <div wicket:id="fileList" class="list-group-item"> + <span wicket:id="file">(file)</span> + <a href="#" wicket:id="delete" class="btn btn-sm text-danger"><i class="glyphicon glyphicon-trash"></i></a> + </div> + </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/upload/MultiUploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java index 9ea3ade..98f6985 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.form.upload.MultiFileUploadField; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; @@ -40,6 +39,8 @@ import org.apache.wicket.util.file.Files; import org.apache.wicket.util.file.Folder; import org.apache.wicket.util.lang.Bytes; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; + /** * Upload example. @@ -173,7 +174,7 @@ public class MultiUploadPage extends WicketExamplePage Folder uploadFolder = getUploadFolder(); // Create feedback panels - final FeedbackPanel uploadFeedback = new FeedbackPanel("uploadFeedback"); + final NotificationPanel uploadFeedback = new NotificationPanel("uploadFeedback"); // Add uploadFeedback to the page itself add(uploadFeedback); http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html index 864788d..0fa86c9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html @@ -7,66 +7,82 @@ fieldset { border: 1px solid #e9601a; padding: 10px; margin-top: 10px;} </style> </head> +<wicket:head> + <style> + .file-preview-thumbnails { + overflow: hidden; + } + </style> +</wicket:head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p>Wicket can also handle file uploads via AJAX, please see AJAX examples section. AJAX Functionality is not included in this example to keep things simple.</p> <p>The maximum file size of a single upload is: 90k!</p> <p>The maximum size of uploading several files (third demo) is: 100k!</p> <br/> - <form wicket:id="simpleUpload"> - <fieldset> - <legend>Upload form</legend> - <p> - <label for="simpleUpload">File</label> - <input wicket:id="fileInput" type="file" id="simpleUpload"/> - </p> - <input type="submit" value="Upload!"/> - </fieldset> - </form> - - <form wicket:id="progressUpload"> - <fieldset> - <legend>Upload form with progress bar</legend> - <p> - <label for="uploadWithProgress">File</label> - <input wicket:id="fileInput" type="file" id="uploadWithProgress"/> - </p> - <input type="submit" value="Upload!"/> - <span wicket:id="progress">[[upload progressbar]]</span> - </fieldset> - </form> + <div class="row"> + <div class="col-sm-6"> + <form wicket:id="simpleUpload"> + <fieldset> + <legend>Upload form</legend> + <p> + <label for="simpleUpload">File</label> + <input wicket:id="fileInput" type="file" id="simpleUpload"/> + </p> + <input type="submit" value="Upload!" class="btn btn-primary"/> + </fieldset> + </form> + </div> + </div> - <form wicket:id="html5Upload"> - <fieldset> - <legend>Upload form that uses HTML5 <input type="file" <strong>multiple</strong> />, so it can upload - more than one file in browsers which support <em>multiple</em> attribute</legend> - <p> - <label for="multiUpload">File</label> - <input wicket:id="fileInput" type="file" multiple="multiple" id="multiUpload"/> - </p> - <input type="submit" value="Upload!"/> - </fieldset> - </form> + <div class="row"> + <div class="col-sm-6"> + <form wicket:id="progressUpload"> + <fieldset> + <legend>Upload form with progress bar</legend> + <p> + <label for="uploadWithProgress">File</label> + <input wicket:id="fileInput" type="file" id="uploadWithProgress"/> + </p> + <input type="submit" value="Upload!" class="btn btn-info"/> + <span wicket:id="progress">[[upload progressbar]]</span> + </fieldset> + </form> + </div> + </div> + <div class="row"> + <div class="col-sm-6"> + <form wicket:id="html5Upload"> + <fieldset> + <legend>Upload form that uses HTML5 <input type="file" <strong>multiple</strong> />, so it can upload + more than one file in browsers which support <em>multiple</em> attribute</legend> + <p> + <label for="multiUpload">File</label> + <input wicket:id="fileInput" type="file" multiple="multiple" id="multiUpload"/> + </p> + <input type="submit" value="Upload!" class="btn btn-default"/> + </fieldset> + </form> + </div> + </div> - <div> - <span wicket:id="uploadFeedback"/> - </div> + <div wicket:id="uploadFeedback"></div> - <div> - <h4>Current files in <span wicket:id="dir">(dir)</span>:</h4> - <table> - <tr wicket:id="fileList"> - <td width="200"><span wicket:id="file">(file)</span></td> - <td><a href="#" wicket:id="delete"><img src="delete.gif" border="0"/></a></td> - </tr> - </table> + <div class="row"> + <div class="col-sm-4"> + <h4>Current files in <span wicket:id="dir">(dir)</span>:</h4> + <div class="list-group"> + <div wicket:id="fileList" class="list-group-item"> + <td width="200"><span wicket:id="file">(file)</span></td> + <td><a href="#" wicket:id="delete"><img src="delete.gif" border="0"/></a></td> + </div> + </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/upload/UploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java index 4ee91eb..16f03e2 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java @@ -20,13 +20,14 @@ import java.io.File; import java.util.Arrays; import java.util.List; +import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField; import org.apache.wicket.Application; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; @@ -91,7 +92,7 @@ public class UploadPage extends WicketExamplePage */ private class FileUploadForm extends Form<Void> { - FileUploadField fileUploadField; + BootstrapFileInputField fileUploadField; /** * Construct. @@ -107,7 +108,7 @@ public class UploadPage extends WicketExamplePage setMultiPart(true); // Add one file input field - add(fileUploadField = new FileUploadField("fileInput")); + add(fileUploadField = new BootstrapFileInputField("fileInput")); // Set maximum size to 100K for demo purposes setMaxSize(Bytes.kilobytes(100)); @@ -163,10 +164,12 @@ public class UploadPage extends WicketExamplePage */ public UploadPage(final PageParameters parameters) { + super(parameters); + Folder uploadFolder = getUploadFolder(); // Create feedback panels - final FeedbackPanel uploadFeedback = new FeedbackPanel("uploadFeedback"); + final NotificationPanel uploadFeedback = new NotificationPanel("uploadFeedback"); // Add uploadFeedback to the page itself add(uploadFeedback); http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html index 1132bd0..9eceb85 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html @@ -5,21 +5,22 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <h3>Examples of extension's wizards package</h3> <ul> <li> - <a wicket:id="staticWizardLink" href="#">static wizard using plain text steps</a> + <a wicket:id="staticWizardLink" class="btn btn-link">static wizard using plain text steps</a> </li> <li> - <a wicket:id="staticWizardWithPanelsLink" href="#">static wizard using panel steps</a> + <a wicket:id="staticWizardWithPanelsLink" class="btn btn-link">static wizard using panel steps</a> </li> <li> - <a wicket:id="newUserWizardLink" href="#">wizard for creating a new user</a> + <a wicket:id="newUserWizardLink" class="btn btn-link">wizard for creating a new user</a> </li> </ul> +</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/wizard/NewUserWizard$UserDetailsStep.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserDetailsStep.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserDetailsStep.html index 01e0952..7ff26ac 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserDetailsStep.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserDetailsStep.html @@ -1,20 +1,30 @@ <wicket:panel xmlns:wicket="http://wicket.apache.org";> - <table> - <tr> - <td><wicket:message key="firstName">First Name</wicket:message></td> - <td><input type="text" wicket:id="user.firstName" /></td> - </tr> - <tr> - <td><wicket:message key="lastName">Last Name</wicket:message></td> - <td><input type="text" wicket:id="user.lastName" /></td> - </tr> - <tr> - <td><wicket:message key="department">Department</wicket:message></td> - <td><input type="text" wicket:id="user.department" /></td> - </tr> - <tr> - <td><wicket:message key="assignRoles">Assign roles</wicket:message></td> - <td><input type="checkbox" wicket:id="assignRoles" /></td> - </tr> - </table> + <div class="form-group"> + <label wicket:for="user.firstName" class="col-sm-2 control-label"><wicket:message key="firstName">First Name</wicket:message></label> + <div class="col-sm-10"> + <input type="email" class="form-control" wicket:id="user.firstName"> + </div> + </div> + <div class="form-group"> + <label wicket:for="user.lastName" class="col-sm-2 control-label"><wicket:message key="lastName">Last Name</wicket:message></label> + <div class="col-sm-10"> + <input type="text" class="form-control" wicket:id="user.lastName"> + </div> + </div> + <div class="form-group"> + <label wicket:for="user.department" class="col-sm-2 control-label"><wicket:message key="department">Department</wicket:message></label> + <div class="col-sm-10"> + <input type="text" class="form-control" wicket:id="user.department"> + </div> + </div> + <div class="form-group"> + <div class="col-sm-offset-2 col-sm-10"> + <div class="checkbox"> + <label> + <td><input type="checkbox" /></td> + <wicket:message key="assignRoles">Assign roles</wicket:message> <input type="checkbox" wicket:id="assignRoles"/> + </label> + </div> + </div> + </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java index 139392e..5b6a9e5 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java @@ -110,8 +110,7 @@ public class NewUserWizard extends Wizard FormComponent<String> email = new RequiredTextField<String>("user.email").add(EmailAddressValidator.getInstance()); add(email); - TextField<String> emailRepeat = new TextField<>("emailRepeat", - new Model<String>()); + TextField<String> emailRepeat = new TextField<>("emailRepeat", new Model<String>()); add(emailRepeat); add(new EqualInputValidator(email, emailRepeat)); @@ -273,4 +272,4 @@ public class NewUserWizard extends Wizard { this.user = user; } -} \ 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/wizard/WizardApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java index 94e85fa..e24c426 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java @@ -17,32 +17,18 @@ package org.apache.wicket.examples.wizard; import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.examples.WicketExampleApplication; /** * Application class for the wizard example. * * @author Eelco Hillenius */ -public class WizardApplication extends WebApplication +public class WizardApplication 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/wizard/WizardPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html index 46d25b6..83ea84d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <div> <wicket:link><a href="Index.html">[back to the wizard index]</a></wicket:link> @@ -13,5 +13,6 @@ <div wicket:id="wizard">Wizard will be placed here</div> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html index b944180..8c1f48c 100644 --- a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html +++ b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> <p> This page was loaded from the web context. It was found by the custom resource stream locator, which is set in the application object of this example. @@ -15,5 +15,6 @@ taking the path into account. This is not the preferred way of doing thing, but it is here to show you that you can do your own path interpretation. </p> +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html b/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html index 0226535..8a6ee8b 100644 --- a/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html +++ b/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html @@ -5,8 +5,9 @@ <link rel="stylesheet" type="text/css" href="style.css"/> </head> <body> - <span wicket:id="mainNavigation"/> +<wicket:extend> This page was loaded from the web context. It was found by the custom resource stream locator, which is set in the application object of this example. +</wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/78032475/wicket-examples/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/WEB-INF/web.xml b/wicket-examples/src/main/webapp/WEB-INF/web.xml index 92f956a..0afa0ba 100644 --- a/wicket-examples/src/main/webapp/WEB-INF/web.xml +++ b/wicket-examples/src/main/webapp/WEB-INF/web.xml @@ -310,7 +310,7 @@ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <init-param> <param-name>applicationClassName</param-name> - <param-value>org.apache.wicket.examples.kittenCaptcha.WicketApplication</param-value> + <param-value>org.apache.wicket.examples.kittenCaptcha.KittenCaptchaApplication</param-value> </init-param> </filter> <filter>
