SourceForge: wishlist/wishlist: changeset 82:a6da2cb9e1e7
fixed remainging pages
authorIvar Abrahamsen <ivar@flurdy.com>
Wed Oct 07 23:38:04 2009 +0200 (7 weeks ago)
changeset 82a6da2cb9e1e7
parent 814f5f392ec21a
child 83ceb349a99418
fixed remainging pages
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/panel/WishlistDeckPanel.java
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.html
wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java
wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css
     1.1 --- a/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
     1.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html	Wed Oct 07 23:38:04 2009 +0200
     1.3 @@ -49,7 +49,7 @@
     1.4  
     1.5  
     1.6  
     1.7 -<!--<img src="images/blank.gif" width="1" height="300" align="left"/>-->
     1.8 +<!-- <img src="images/blank.gif" width="1" height="300" align="left"/> -->
     1.9  
    1.10  <div wicket:id="feedback"></div>
    1.11  
     2.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.html	Wed Oct 07 19:13:26 2009 +0200
     2.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.html	Wed Oct 07 23:38:04 2009 +0200
     2.3 @@ -2,19 +2,6 @@
     2.4  
     2.5  <wicket:extend>
     2.6  
     2.7 -							<tr>
     2.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
     2.9 -
    2.10 -								</td>
    2.11 -							</tr>
    2.12 -							<tr>
    2.13 -								<!--
    2.14 -								<td id="hatch" class="grid" colspan="1" rowspan="2" wicket:id="hatch">
    2.15 -
    2.16 -								</td>
    2.17 -								-->
    2.18 -
    2.19 -								<td id="cargo" class="grid" colspan="2" rowspan="1">
    2.20  
    2.21  
    2.22  <div wicket:id="feedback"></div>
    2.23 @@ -42,27 +29,6 @@
    2.24  
    2.25  
    2.26  
    2.27 -								</td>
    2.28 -
    2.29 -								<td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
    2.30 -
    2.31 -								</td>
    2.32 -							</tr>
    2.33 -
    2.34 -
    2.35 -							<tr>
    2.36 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
    2.37 -								&nbsp;
    2.38 -								</td>
    2.39 -							</tr>
    2.40 -							<!--
    2.41 -							<tr>
    2.42 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
    2.43 -									
    2.44 -								</td>
    2.45 -							</tr>
    2.46 -							-->
    2.47 -
    2.48  
    2.49  <wicket:fragment wicket:id="hatchFragment">
    2.50  	
     3.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java	Wed Oct 07 19:13:26 2009 +0200
     3.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java	Wed Oct 07 23:38:04 2009 +0200
     3.3 @@ -39,10 +39,10 @@
     3.4      }
     3.5  
     3.6  	private void addLayout()    {		
     3.7 -		add( new CockpitPanel("cockpit","wish add"));
     3.8 +		add( new CockpitPanel(COCKPIT_ID,"wish add"));
     3.9  		// add( new HatchFragement("hatch"));
    3.10 -		add( new WishDeckPanel("deck"));
    3.11 -		add( new KeelPanel("keel"));
    3.12 +		add( new WishDeckPanel(HATCH_ID));
    3.13 +//		add( new KeelPanel("keel"));
    3.14  		addCargo();
    3.15  	}
    3.16  
     4.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.html	Wed Oct 07 19:13:26 2009 +0200
     4.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.html	Wed Oct 07 23:38:04 2009 +0200
     4.3 @@ -1,24 +1,12 @@
     4.4  <html>
     4.5  <wicket:extend>
     4.6  
     4.7 -<tr>
     4.8 -    <td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">cockpit title</td>
     4.9 -</tr>
    4.10 -
    4.11 -<tr>
    4.12 -
    4.13 -<!--
    4.14 -    <td id="hatch" class="grid" colspan="1" rowspan="2" wicket:id="hatch">hatch</td>
    4.15 --->
    4.16 -
    4.17 -<td id="cargo" class="grid" colspan="2" rowspan="1">
    4.18 -
    4.19  
    4.20      <div wicket:id="feedback">feedback</div>
    4.21  
    4.22      <form wicket:id="editWishForm">
    4.23  		<input type="hidden" wicket:id="wishId"/>
    4.24 -		<table border="1">
    4.25 +		<table>
    4.26  			<tr>
    4.27  			<th>title</th>
    4.28  			<td><input type="text" wicket:id="title"/></td>
    4.29 @@ -45,17 +33,6 @@
    4.30      </form>
    4.31  	<div wicket:id="tagPool">tag pool</div>
    4.32  
    4.33 -    
    4.34 -
    4.35 -
    4.36 -</td>
    4.37 -
    4.38 -    <td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">deck</td>
    4.39 -</tr>
    4.40 -
    4.41 -<tr>
    4.42 -    <td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">keel</td>
    4.43 -</tr>
    4.44  
    4.45  <wicket:fragment wicket:id="hatchFragment"></wicket:fragment>
    4.46  
     5.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java	Wed Oct 07 19:13:26 2009 +0200
     5.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java	Wed Oct 07 23:38:04 2009 +0200
     5.3 @@ -27,9 +27,9 @@
     5.4  
     5.5  	private void addLayout(LoadableWishItemModel wishModel) {
     5.6  		WishItem wish = (WishItem)wishModel.getObject();
     5.7 -		add(new CockpitPanel("cockpit", "edit wish"));
     5.8 -		add(new WishDeckPanel("deck", wish));
     5.9 -		add(new KeelPanel("keel"));
    5.10 +		add(new CockpitPanel(COCKPIT_ID, "edit wish"));
    5.11 +		add(new WishDeckPanel(HATCH_ID, wish));
    5.12 +//		add(new KeelPanel("keel"));
    5.13  		Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
    5.14  		wish = wishServiceAdapter.findWish(wish.getWishId(), dreamer);
    5.15  		wishModel.detach();
     6.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.html	Wed Oct 07 19:13:26 2009 +0200
     6.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.html	Wed Oct 07 23:38:04 2009 +0200
     6.3 @@ -1,24 +1,11 @@
     6.4  <html>
     6.5  <wicket:extend>
     6.6  
     6.7 -<tr>
     6.8 -    <td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">cockpit title</td>
     6.9 -</tr>
    6.10 -
    6.11 -<tr>
    6.12 -
    6.13 -<!--
    6.14 -    <td id="hatch" class="grid" colspan="1" rowspan="2" wicket:id="hatch">hatch</td>
    6.15 --->
    6.16 -
    6.17 -<td id="cargo" class="grid" colspan="2" rowspan="1">
    6.18 -
    6.19 -
    6.20      <div wicket:id="feedback">feedback</div>
    6.21  
    6.22      <form wicket:id="removeWishForm">
    6.23  	<input type="hidden" wicket:id="wishId"/>
    6.24 -	<table border="1">
    6.25 +	<table>
    6.26  	    <tr>
    6.27  		<th>title</th>
    6.28  		<td><span wicket:id="title">title</span></td>
    6.29 @@ -32,15 +19,6 @@
    6.30      
    6.31  
    6.32  
    6.33 -</td>
    6.34 -
    6.35 -    <td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">deck</td>
    6.36 -</tr>
    6.37 -
    6.38 -<tr>
    6.39 -    <td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">keel</td>
    6.40 -</tr>
    6.41 -
    6.42  <wicket:fragment wicket:id="hatchFragment"></wicket:fragment>
    6.43  
    6.44  </wicket:extend>
     7.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java	Wed Oct 07 19:13:26 2009 +0200
     7.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java	Wed Oct 07 23:38:04 2009 +0200
     7.3 @@ -25,9 +25,9 @@
     7.4  	}
     7.5  
     7.6  	private void addLayout(WishItem wish) {
     7.7 -		add(new CockpitPanel("cockpit", "remove wish"));
     7.8 -		add(new WishDeckPanel("deck", wish));
     7.9 -		add(new KeelPanel("keel"));
    7.10 +		add(new CockpitPanel(COCKPIT_ID, "remove wish"));
    7.11 +		add(new WishDeckPanel(HATCH_ID, wish));
    7.12 +//		add(new KeelPanel("keel"));
    7.13  		addCargo(wish);
    7.14  	}
    7.15  
     8.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.html	Wed Oct 07 19:13:26 2009 +0200
     8.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.html	Wed Oct 07 23:38:04 2009 +0200
     8.3 @@ -44,16 +44,6 @@
     8.4  
     8.5  <wicket:extend>
     8.6  
     8.7 -							<tr>
     8.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
     8.9 -
    8.10 -								</td>
    8.11 -							</tr>
    8.12 -							<tr>
    8.13 -
    8.14 -								<td id="cargo" class="grid" colspan="2" rowspan="1">
    8.15 -
    8.16 -
    8.17  
    8.18  
    8.19  
    8.20 @@ -83,19 +73,6 @@
    8.21  </table>
    8.22  
    8.23  
    8.24 -								</td>
    8.25 -
    8.26 -								<td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
    8.27 -
    8.28 -								</td>
    8.29 -							</tr>
    8.30 -
    8.31 -
    8.32 -							<tr>
    8.33 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
    8.34 -								&nbsp;
    8.35 -								</td>
    8.36 -							</tr>
    8.37  
    8.38  
    8.39  <wicket:fragment wicket:id="hatchFragment">
     9.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java	Wed Oct 07 19:13:26 2009 +0200
     9.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java	Wed Oct 07 23:38:04 2009 +0200
     9.3 @@ -61,10 +61,10 @@
     9.4      }
     9.5  
     9.6  	private void addLayout(LoadableWishItemModel wishModel)    {
     9.7 -		add( new CockpitPanel("cockpit","wish"));
     9.8 +		add( new CockpitPanel(COCKPIT_ID,"wish"));
     9.9  		WishItem wish = wishModel.getObject();
    9.10 -		add( new WishDeckPanel("deck", wish));
    9.11 -		add( new KeelPanel("keel"));
    9.12 +		add( new WishDeckPanel(HATCH_ID, wish));
    9.13 +//		add( new KeelPanel("keel"));
    9.14  		addCargo(wishModel);
    9.15  	}
    9.16  
    10.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html	Wed Oct 07 19:13:26 2009 +0200
    10.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html	Wed Oct 07 23:38:04 2009 +0200
    10.3 @@ -42,21 +42,7 @@
    10.4  						</tr>
    10.5  
    10.6  						<wicket:extend>
    10.7 -							<tr>
    10.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
    10.9 -								</td>
   10.10 -							</tr>
   10.11 -
   10.12 -
   10.13 -							<tr>
   10.14 -
   10.15 -								<td id="hatch" class="grid" colspan="1" rowspan="2">
   10.16 -
   10.17 -								</td>
   10.18 -
   10.19 -								<td id="cargo" class="grid" colspan="1" rowspan="1">
   10.20 -
   10.21 -
   10.22 +					
   10.23  									<div style="float: right; overflow: auto; padding: 1em; height: 400px;">
   10.24  									<table>
   10.25  										<tr>
   10.26 @@ -178,18 +164,7 @@
   10.27  
   10.28  									<div wicket:id="feedback"></div>
   10.29  
   10.30 -								</td>
   10.31 -								<td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
   10.32 -								</td>
   10.33 -							</tr>
   10.34 -
   10.35 -
   10.36 -							<tr>
   10.37 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
   10.38 -									&nbsp;
   10.39 -								</td>
   10.40 -							</tr>
   10.41 -
   10.42 +					
   10.43  						</wicket:extend>
   10.44  
   10.45  						<tr>
    11.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java	Wed Oct 07 19:13:26 2009 +0200
    11.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java	Wed Oct 07 23:38:04 2009 +0200
    11.3 @@ -36,9 +36,9 @@
    11.4  	}
    11.5  
    11.6  	private void addLayout(LoadableWishlistModel wishlistModel) {
    11.7 -		add(new CockpitPanel("cockpit", "edit wishlist"));
    11.8 +		add(new CockpitPanel(COCKPIT_ID, "edit wishlist"));
    11.9  		add(new WishlistDeckPanel(wishlistModel));
   11.10 -		add(new KeelPanel("keel"));
   11.11 +//		add(new KeelPanel("keel"));
   11.12  //		Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
   11.13  //		WishList wishlist = wishlistModel.load();
   11.14  //		WishList wishlist = wishServiceAdapter.findWishlist(modelList.getWishlistId(), dreamer);
    12.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.html	Wed Oct 07 19:13:26 2009 +0200
    12.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.html	Wed Oct 07 23:38:04 2009 +0200
    12.3 @@ -42,23 +42,8 @@
    12.4  						</tr>
    12.5  
    12.6  						<wicket:extend>
    12.7 -							<tr>
    12.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
    12.9 -								</td>
   12.10 -							</tr>
   12.11  
   12.12 -
   12.13 -							<tr>
   12.14 -
   12.15 -								<td id="hatch" class="grid" colspan="1" rowspan="2">
   12.16 -
   12.17 -								</td>
   12.18 -
   12.19 -								<td id="cargo" class="grid" colspan="1" rowspan="1">
   12.20 -
   12.21 -
   12.22 -									<img src="images/blank.gif" width="1" height="300" align="left"/>
   12.23 -
   12.24 +						
   12.25  
   12.26  									<form action="#" wicket:id="newWishlistForm">
   12.27  										<table>
   12.28 @@ -79,18 +64,8 @@
   12.29  
   12.30  									<div wicket:id="feedback"></div>
   12.31  
   12.32 -								</td>
   12.33 -								<td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
   12.34 -								</td>
   12.35 -							</tr>
   12.36  
   12.37  
   12.38 -							<tr>
   12.39 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
   12.40 -									&nbsp;
   12.41 -								</td>
   12.42 -							</tr>
   12.43 -
   12.44  						</wicket:extend>
   12.45  
   12.46  						<tr>
    13.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java	Wed Oct 07 19:13:26 2009 +0200
    13.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java	Wed Oct 07 23:38:04 2009 +0200
    13.3 @@ -33,9 +33,9 @@
    13.4  	}
    13.5  
    13.6  	private void addLayout() {
    13.7 -		add(new CockpitPanel("cockpit", "new wishlist"));
    13.8 -		add(new WishDeckPanel("deck"));
    13.9 -		add(new KeelPanel("keel"));
   13.10 +		add(new CockpitPanel(COCKPIT_ID, "new wishlist"));
   13.11 +		add(new WishDeckPanel(HATCH_ID));
   13.12 +//		add(new KeelPanel("keel"));
   13.13  		addCargo();
   13.14  	}
   13.15  
    14.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.html	Wed Oct 07 19:13:26 2009 +0200
    14.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.html	Wed Oct 07 23:38:04 2009 +0200
    14.3 @@ -42,22 +42,9 @@
    14.4  						</tr>
    14.5  
    14.6  						<wicket:extend>
    14.7 -							<tr>
    14.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
    14.9 -								</td>
   14.10 -							</tr>
   14.11  
   14.12  
   14.13 -							<tr>
   14.14 -
   14.15 -								<td id="hatch" class="grid" colspan="1" rowspan="2">
   14.16 -
   14.17 -								</td>
   14.18 -
   14.19 -								<td id="cargo" class="grid" colspan="1" rowspan="1">
   14.20 -
   14.21 -									<img src="images/blank.gif" width="1" height="300" align="left"/>
   14.22 -
   14.23 +							
   14.24  									<table>
   14.25  										<tr>
   14.26  											<th>title</th>
   14.27 @@ -117,17 +104,8 @@
   14.28  
   14.29  									<div wicket:id="feedback"></div>
   14.30  
   14.31 -								</td>
   14.32 -								<td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
   14.33 -								</td>
   14.34 -							</tr>
   14.35  
   14.36 -
   14.37 -							<tr>
   14.38 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
   14.39 -									&nbsp;
   14.40 -								</td>
   14.41 -							</tr>
   14.42 +									
   14.43  
   14.44  						</wicket:extend>
   14.45  
    15.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java	Wed Oct 07 19:13:26 2009 +0200
    15.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java	Wed Oct 07 23:38:04 2009 +0200
    15.3 @@ -20,9 +20,9 @@
    15.4  	}
    15.5  
    15.6  	private void addLayout(LoadableWishlistModel wishlistModel) {
    15.7 -		add(new CockpitPanel("cockpit", "edit wishlist"));
    15.8 +		add(new CockpitPanel( COCKPIT_ID, "edit wishlist"));
    15.9  		add(new WishlistDeckPanel(wishlistModel));
   15.10 -		add(new KeelPanel("keel"));
   15.11 +//		add(new KeelPanel("keel"));
   15.12  //		Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
   15.13  //		WishList wishlist = wishlistModel.load();
   15.14  //		WishList wishlist = wishServiceAdapter.findWishlist(modelList.getWishlistId(), dreamer);
    16.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/panel/WishlistDeckPanel.java	Wed Oct 07 19:13:26 2009 +0200
    16.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/panel/WishlistDeckPanel.java	Wed Oct 07 23:38:04 2009 +0200
    16.3 @@ -18,7 +18,7 @@
    16.4  
    16.5  public class WishlistDeckPanel extends DeckPanel {
    16.6  
    16.7 -	private static final String id = "deck";
    16.8 +	private static final String id = "hatch";
    16.9  
   16.10  	public WishlistDeckPanel( LoadableWishlistModel wishlistModel) {
   16.11  		super(id);
    17.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.html	Wed Oct 07 19:13:26 2009 +0200
    17.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.html	Wed Oct 07 23:38:04 2009 +0200
    17.3 @@ -42,23 +42,7 @@
    17.4  							</tr>
    17.5  
    17.6  <wicket:extend>
    17.7 -							<tr>
    17.8 -								<td id="cockpit" class="grid" colspan="3" rowspan="1" wicket:id="cockpit">
    17.9 -								</td>
   17.10 -							</tr>
   17.11 -
   17.12 -
   17.13 -							<tr>
   17.14 -
   17.15 -								<td id="hatch" class="grid" colspan="1" rowspan="2">
   17.16 -
   17.17 -								</td>
   17.18 -
   17.19 -								<td id="cargo" class="grid" colspan="1" rowspan="1">
   17.20 -
   17.21 -
   17.22 -<img src="images/blank.gif" width="1" height="300" align="left"/>
   17.23 -
   17.24 +							
   17.25  
   17.26  
   17.27  <div id="tagWishPoolBox" wicket:id="tagWishPoolBox">
   17.28 @@ -75,19 +59,6 @@
   17.29  </div>
   17.30  
   17.31  
   17.32 -
   17.33 -								</td>
   17.34 -								<!-- <td id="deck" class="grid" colspan="1" rowspan="2" wicket:id="deck">
   17.35 -								</td> -->
   17.36 -							</tr>
   17.37 -
   17.38 -
   17.39 -							<tr>
   17.40 -								<td id="keel" class="grid" colspan="1" rowspan="1" wicket:id="keel">
   17.41 -								&nbsp;
   17.42 -								</td>
   17.43 -							</tr>
   17.44 -
   17.45  </wicket:extend>
   17.46  
   17.47  							<tr>
    18.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java	Wed Oct 07 19:13:26 2009 +0200
    18.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java	Wed Oct 07 23:38:04 2009 +0200
    18.3 @@ -22,15 +22,15 @@
    18.4  	}
    18.5  
    18.6  	private void addLayout(Tag tag){
    18.7 -		add( new CockpitPanel("cockpit","tag"));
    18.8 -		// add( new WishDeckPanel("deck"));
    18.9 +		add( new CockpitPanel(COCKPIT_ID,"tag"));
   18.10 +		 add( new WebMarkupContainer(HATCH_ID));
   18.11  		addCargo(tag);
   18.12  
   18.13  	}
   18.14  
   18.15  	private void addCargo(Tag tag){
   18.16  
   18.17 -		add( new KeelPanel("keel"));
   18.18 +//		add( new KeelPanel("keel"));
   18.19  
   18.20  		
   18.21  		Dreamer dreamerOrNone = AuthenticatedWishlistSession.get().getSessionDreamer();
    19.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css	Wed Oct 07 19:13:26 2009 +0200
    19.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css	Wed Oct 07 23:38:04 2009 +0200
    19.3 @@ -24,7 +24,10 @@
    19.4  	border-radius: 10px;
    19.5  	-webkit-border-radius: 10px;
    19.6  	-moz-border-radius: 10px;
    19.7 +	-opera-border-radius: 10px;
    19.8  	-moz-box-shadow: 10px 10px 15px -5px #333333;
    19.9 +	-opera-box-shadow: 10px 10px 15px -5px #333333;
   19.10 +	-webkit-box-shadow: 10px 10px 15px -5px #333333;
   19.11  }
   19.12  
   19.13  /* internal */
   19.14 @@ -49,9 +52,9 @@
   19.15  .compartment { padding: 0.2em 1em; }
   19.16  body { padding: 0.2em; }
   19.17  #ocean { margin-left: 1em; }
   19.18 -#ballast { width: 30em; padding: 2em; min-height: 25em;  }
   19.19 -#port {  width: 4em; min-width: 4em;  }
   19.20 -#starboard {  width: 8em; min-width: 8em;   }
   19.21 +#ballast { width: 40em; padding: 2em; min-height: 25em;  }
   19.22 +#port {  width: 1em; min-width: 1em;  }
   19.23 +#starboard {  width: 1em; min-width: 1em;   }
   19.24  #hatch { width: 8em; min-width: 8em;   }
   19.25  #deck { width: 6em; min-width: 6em;  }
   19.26  #ama { padding: 0.8em 0 0 1em;  }