1.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Wed Oct 07 18:09:52 2009 +0200
1.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Wed Oct 07 19:13:26 2009 +0200
1.3 @@ -32,7 +32,7 @@
1.4 <div id="bow" class="compartment"> </div>
1.5 <div id="lookout" class="compartment">
1.6 <wicket:link>
1.7 - <a href="wish/WishIndex.html">wish</a>
1.8 + <a href="/wish/WishIndexPage">wish</a>
1.9 <a href="#">shop</a>
1.10 <a href="#">gift</a>
1.11 </wicket:link>
1.12 @@ -45,7 +45,11 @@
1.13 <div id="hatch" class="compartment" wicket:id="hatch"> </div>
1.14 <div id="ballast" class="structure compartment">
1.15 <div id="cargo" class="compartment">
1.16 +
1.17 +
1.18 <wicket:child></wicket:child>
1.19 +
1.20 +
1.21 </div>
1.22 </div>
1.23 <div id="deck" class="compartment"> </div>
2.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.html Wed Oct 07 18:09:52 2009 +0200
2.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.html Wed Oct 07 19:13:26 2009 +0200
2.3 @@ -47,13 +47,6 @@
2.4
2.5
2.6
2.7 - <tr>
2.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
2.9 - </td>
2.10 - </tr>
2.11 - <tr>
2.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
2.13 -
2.14
2.15 <img src="images/blank.gif" width="1" height="300" align="left"/>
2.16
2.17 @@ -80,9 +73,6 @@
2.18 <a href="#" wicket:id="registerLink">register</a>
2.19
2.20
2.21 - </td>
2.22 - </tr>
2.23 -
2.24
2.25
2.26
3.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Wed Oct 07 18:09:52 2009 +0200
3.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Wed Oct 07 19:13:26 2009 +0200
3.3 @@ -10,6 +10,7 @@
3.4 import net.sf.wishlist.enterprise.common.exception.WishTechnicalException;
3.5 import net.sf.wishlist.enterprise.server.logic.service.IDreamerService;
3.6 import org.apache.wicket.PageParameters;
3.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
3.8 import org.apache.wicket.markup.html.form.Form;
3.9 import org.apache.wicket.markup.html.form.PasswordTextField;
3.10 import org.apache.wicket.markup.html.form.RequiredTextField;
3.11 @@ -37,7 +38,8 @@
3.12 }
3.13
3.14 private void addLayout() {
3.15 - add( new CockpitPanel("cockpit","login"));
3.16 + add( new CockpitPanel(COCKPIT_ID,"login"));
3.17 + add( new WebMarkupContainer(HATCH_ID));
3.18 add( new Link("registerLink"){
3.19 @Override
3.20 public void onClick() {
4.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html Wed Oct 07 18:09:52 2009 +0200
4.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html Wed Oct 07 19:13:26 2009 +0200
4.3 @@ -47,15 +47,9 @@
4.4
4.5
4.6
4.7 - <tr>
4.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
4.9 - </td>
4.10 - </tr>
4.11 - <tr>
4.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
4.13
4.14
4.15 -<img src="images/blank.gif" width="1" height="300" align="left"/>
4.16 +<!--<img src="images/blank.gif" width="1" height="300" align="left"/>-->
4.17
4.18 <div wicket:id="feedback"></div>
4.19
4.20 @@ -92,9 +86,6 @@
4.21 <a href="#" wicket:id="loginLink">login</a>
4.22
4.23
4.24 - </td>
4.25 - </tr>
4.26 -
4.27
4.28
4.29
5.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Wed Oct 07 18:09:52 2009 +0200
5.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Wed Oct 07 19:13:26 2009 +0200
5.3 @@ -8,6 +8,7 @@
5.4 import net.sf.wishlist.enterprise.common.domain.Dreamer;
5.5 import net.sf.wishlist.enterprise.server.logic.service.IDreamerService;
5.6 import org.apache.wicket.PageParameters;
5.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
5.8 import org.apache.wicket.markup.html.form.Form;
5.9 import org.apache.wicket.markup.html.form.PasswordTextField;
5.10 import org.apache.wicket.markup.html.form.RequiredTextField;
5.11 @@ -36,7 +37,8 @@
5.12 }
5.13
5.14 private void addLayout() {
5.15 - add( new CockpitPanel("cockpit","register"));
5.16 + add( new CockpitPanel(COCKPIT_ID,"register"));
5.17 + add( new WebMarkupContainer(HATCH_ID));
5.18 add( new Link("loginLink"){
5.19 @Override
5.20 public void onClick() {
6.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/WishlistApplication.java Wed Oct 07 18:09:52 2009 +0200
6.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/WishlistApplication.java Wed Oct 07 19:13:26 2009 +0200
6.3 @@ -48,6 +48,7 @@
6.4 //mount("/register.html", PackageName.forPackage(RegisterPage.class.getPackage()));
6.5 mount("/wish", PackageName.forPackage(WishIndexPage.class.getPackage()));
6.6 mountBookmarkablePage("index.html", IndexPage.class);
6.7 + mountBookmarkablePage("/wish/index.html", WishIndexPage.class);
6.8 mountBookmarkablePage("login.html", LoginPage.class);
6.9 mountBookmarkablePage("register.html", RegisterPage.class);
6.10 mount(new HybridUrlCodingStrategy("/error/pagenotfound.html", PageNotFoundPage.class));
7.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.html Wed Oct 07 18:09:52 2009 +0200
7.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.html Wed Oct 07 19:13:26 2009 +0200
7.3 @@ -3,12 +3,6 @@
7.4
7.5
7.6
7.7 - <tr>
7.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
7.9 - </td>
7.10 - </tr>
7.11 - <tr>
7.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
7.13
7.14
7.15 <h2>Uh dear! a 403!</h2>
7.16 @@ -36,10 +30,6 @@
7.17
7.18
7.19
7.20 -</td>
7.21 -</tr>
7.22 -
7.23 -
7.24
7.25
7.26 </wicket:extend>
8.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Wed Oct 07 18:09:52 2009 +0200
8.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Wed Oct 07 19:13:26 2009 +0200
8.3 @@ -7,6 +7,7 @@
8.4
8.5 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
8.6 import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
8.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
8.8
8.9 /**
8.10 *
8.11 @@ -20,7 +21,8 @@
8.12 }
8.13
8.14 private void addLayout() {
8.15 - add( new CockpitPanel("cockpit","access denied"));
8.16 + add( new CockpitPanel(COCKPIT_ID,"access denied"));
8.17 + add( new WebMarkupContainer(HATCH_ID));
8.18 addCargo();
8.19 }
8.20
9.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.html Wed Oct 07 18:09:52 2009 +0200
9.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.html Wed Oct 07 19:13:26 2009 +0200
9.3 @@ -3,13 +3,6 @@
9.4
9.5
9.6
9.7 - <tr>
9.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
9.9 - </td>
9.10 - </tr>
9.11 - <tr>
9.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
9.13 -
9.14
9.15
9.16 <h2>Uh oh!</h2>
9.17 @@ -48,11 +41,5 @@
9.18
9.19
9.20
9.21 - </td>
9.22 - </tr>
9.23 -
9.24 -
9.25 -
9.26 -
9.27 </wicket:extend>
9.28 </html>
10.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Wed Oct 07 18:09:52 2009 +0200
10.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Wed Oct 07 19:13:26 2009 +0200
10.3 @@ -8,6 +8,7 @@
10.4 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
10.5 import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
10.6 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
10.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
10.8 import org.apache.wicket.markup.html.basic.Label;
10.9
10.10 /**
10.11 @@ -30,7 +31,8 @@
10.12 }
10.13
10.14 private void addLayout() {
10.15 - add( new CockpitPanel("cockpit","application error"));
10.16 + add( new CockpitPanel(COCKPIT_ID,"application error"));
10.17 + add( new WebMarkupContainer(HATCH_ID));
10.18 }
10.19
10.20 private void addCargo() {
11.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.html Wed Oct 07 18:09:52 2009 +0200
11.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.html Wed Oct 07 19:13:26 2009 +0200
11.3 @@ -3,12 +3,6 @@
11.4
11.5
11.6
11.7 - <tr>
11.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
11.9 - </td>
11.10 - </tr>
11.11 - <tr>
11.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
11.13
11.14 <h2>Doh!</h2>
11.15 <h3>Page expired</h3>
11.16 @@ -48,11 +42,6 @@
11.17 </p>
11.18 -->
11.19
11.20 - </td>
11.21 - </tr>
11.22 -
11.23 -
11.24 -
11.25
11.26 </wicket:extend>
11.27 </html>
12.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Wed Oct 07 18:09:52 2009 +0200
12.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Wed Oct 07 19:13:26 2009 +0200
12.3 @@ -7,6 +7,7 @@
12.4
12.5 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
12.6 import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
12.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
12.8
12.9 /**
12.10 *
12.11 @@ -20,7 +21,8 @@
12.12 }
12.13
12.14 private void addLayout() {
12.15 - add( new CockpitPanel("cockpit","page expired"));
12.16 + add( new CockpitPanel(COCKPIT_ID,"page expired"));
12.17 + add( new WebMarkupContainer(HATCH_ID));
12.18 addCargo();
12.19 }
12.20
13.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.html Wed Oct 07 18:09:52 2009 +0200
13.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.html Wed Oct 07 19:13:26 2009 +0200
13.3 @@ -3,14 +3,6 @@
13.4
13.5
13.6
13.7 - <tr>
13.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
13.9 - </td>
13.10 - </tr>
13.11 - <tr>
13.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
13.13 -
13.14 -
13.15 <h2>Uh oh! a 404!</h2>
13.16
13.17 <p>The page you are looking for is no longer here.</p>
13.18 @@ -33,12 +25,5 @@
13.19
13.20
13.21
13.22 -
13.23 - </td>
13.24 - </tr>
13.25 -
13.26 -
13.27 -
13.28 -
13.29 </wicket:extend>
13.30 </html>
14.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Wed Oct 07 18:09:52 2009 +0200
14.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Wed Oct 07 19:13:26 2009 +0200
14.3 @@ -8,6 +8,7 @@
14.4 import javax.servlet.http.HttpServletResponse;
14.5 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
14.6 import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
14.7 +import org.apache.wicket.markup.html.WebMarkupContainer;
14.8
14.9 /**
14.10 *
14.11 @@ -37,7 +38,9 @@
14.12 }
14.13
14.14 private void addLayout() {
14.15 - add( new CockpitPanel("cockpit","404: not found"));
14.16 + add( new CockpitPanel(COCKPIT_ID,"404: not found"));
14.17 + add( new WebMarkupContainer(HATCH_ID));
14.18 +// add( new WebMarkupContainer(DECK_ID));
14.19 addCargo();
14.20 }
14.21
15.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.html Wed Oct 07 18:09:52 2009 +0200
15.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.html Wed Oct 07 19:13:26 2009 +0200
15.3 @@ -3,12 +3,6 @@
15.4
15.5
15.6
15.7 - <tr>
15.8 - <td id="cockpit" wicket:id="cockpit" class="grid" colspan="3" rowspan="1">
15.9 - </td>
15.10 - </tr>
15.11 - <tr>
15.12 - <td id="cargo" class="grid" colspan="3" rowspan="1">
15.13
15.14 <h2>Oh no! a 500!</h2>
15.15
15.16 @@ -45,11 +39,5 @@
15.17
15.18
15.19
15.20 - </td>
15.21 - </tr>
15.22 -
15.23 -
15.24 -
15.25 -
15.26 </wicket:extend>
15.27 </html>
16.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Wed Oct 07 18:09:52 2009 +0200
16.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Wed Oct 07 19:13:26 2009 +0200
16.3 @@ -30,7 +30,8 @@
16.4 }
16.5
16.6 private void addLayout() {
16.7 - add( new CockpitPanel("cockpit","500: system error"));
16.8 + add( new CockpitPanel(COCKPIT_ID,"500: system error"));
16.9 + add( new WebMarkupContainer(HATCH_ID));
16.10 }
16.11
16.12 private void addCargo(){
17.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Wed Oct 07 18:09:52 2009 +0200
17.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Wed Oct 07 19:13:26 2009 +0200
17.3 @@ -11,14 +11,14 @@
17.4 .right{ text-align: right; }
17.5 .fleft{ float: left; }
17.6
17.7 -#lookout { font-size: 16pt; font-weight: bold; }
17.8 +#lookout { font-size: 16pt; font-weight: bold; padding: 0.2em 2em 0.2em 0; }
17.9 #lookout a { padding: 0.2em 2em; text-decoration: none;}
17.10
17.11 #jib { font-size: 1.6em; font-weight: bold; }
17.12
17.13 -#hatch { }
17.14 -#hatch ul { margin: 0.1em; padding: 0.1em; }
17.15 -#hatch ul li { list-style: none; text-align: right; padding: 0.4em 0.7em; border: 1px solid black; margin: 5px; }
17.16 +#hatch { vertical-align: top; padding: 0.01em; }
17.17 +#hatch ul { margin: 0.01em; padding: 0.01em; }
17.18 +#hatch ul li { list-style: none; text-align: right; padding: 0.2em 0.3em; border: 1px dashed #999999; margin: 5px; font-size: 10pt; }
17.19
17.20 #deck { vertical-align: top; }
17.21 #deck ul { margin: 0.1em; padding: 0.1em; }
18.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/grid.css Wed Oct 07 18:09:52 2009 +0200
18.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/grid.css Wed Oct 07 19:13:26 2009 +0200
18.3 @@ -9,7 +9,7 @@
18.4
18.5 root { }
18.6 html { height: 100%; }
18.7 -body { width: 99%; height: 98%; padding: 0; margin: 0; }
18.8 +body { width: 98%; height: 98%; padding: 0; margin: 0; }
18.9 #ocean { display: table; width: 100%; height: 100%; margin: 0 auto; }
18.10 #fleet { display: table-cell; vertical-align: middle; }
18.11 #regatta { display: table; margin: auto; }
19.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Wed Oct 07 18:09:52 2009 +0200
19.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Wed Oct 07 19:13:26 2009 +0200
19.3 @@ -52,7 +52,7 @@
19.4 #ballast { width: 30em; padding: 2em; min-height: 25em; }
19.5 #port { width: 4em; min-width: 4em; }
19.6 #starboard { width: 8em; min-width: 8em; }
19.7 -#hatch { width: 4em; min-width: 4em; }
19.8 +#hatch { width: 8em; min-width: 8em; }
19.9 #deck { width: 6em; min-width: 6em; }
19.10 #ama { padding: 0.8em 0 0 1em; }
19.11 #tug > .compartment { margin: 0 0 0.5em 0; text-align: center; }