1.1 --- a/wish-clients/wish-web/wish-wicket/pom.xml Fri Oct 09 12:11:54 2009 +0200
1.2 +++ b/wish-clients/wish-web/wish-wicket/pom.xml Tue Oct 27 23:02:41 2009 +0100
1.3 @@ -420,12 +420,18 @@
1.4 <version>1.1.1</version>
1.5 </dependency>
1.6 -->
1.7 + <dependency>
1.8 + <groupId>com.flurdy.grid</groupId>
1.9 + <artifactId>grid-wicket</artifactId>
1.10 + <version>0.1-SNAPSHOT</version>
1.11 + </dependency>
1.12 </dependencies>
1.13 -
1.14 +
1.15 <properties>
1.16 <web.port>8810</web.port>
1.17 <web.context>/</web.context>
1.18 <version.wicket>1.4.1</version.wicket>
1.19 </properties>
1.20 -
1.21 +
1.22 </project>
1.23 +
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/wish-clients/wish-web/wish-wicket/resources Tue Oct 27 23:02:41 2009 +0100
2.3 @@ -0,0 +1,22 @@
2.4 +
2.5 +#############################################################
2.6 +
2.7 + JavaRebel 2.0.3 (200908251717)
2.8 + (c) Copyright ZeroTurnaround, Ltd, 2007-2009. All rights reserved.
2.9 +
2.10 + A rough estimate: Over the last 1 days JavaRebel
2.11 + prevented the need for at least 0 redeploys/restarts.
2.12 + Using industry standard redeploy times,
2.13 + JavaRebel saved you between 0 and 0 hours.
2.14 +
2.15 + This product is licensed to Ivar Abrahamsen ([Open-Source] wishlist)
2.16 + until September 15, 2010
2.17 + With the following restrictions:
2.18 + Only for open source development
2.19 +
2.20 +#############################################################
2.21 +
2.22 +
2.23 +JavaRebel: A newer version '2.1a' is available for download
2.24 +JavaRebel: from http://www.zeroturnaround.com/download.
2.25 +
3.1 --- a/wish-clients/wish-web/wish-wicket/src/main/filters/application.properties Fri Oct 09 12:11:54 2009 +0200
3.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/filters/application.properties Tue Oct 27 23:02:41 2009 +0100
3.3 @@ -7,3 +7,4 @@
3.4 db.password=
3.5 db.dialect=org.hibernate.dialect.HSQLDialect
3.6
3.7 +analytics.id=UA-281408-7
3.8 \ No newline at end of file
4.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Fri Oct 09 12:11:54 2009 +0200
4.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Tue Oct 27 23:02:41 2009 +0100
4.3 @@ -6,120 +6,110 @@
4.4 <meta name="description" content="wishlist @ sf.net. Sourceforge open source project for wishlist applications for wishlist, shopping list and gift registry" />
4.5 <title>wishlist.sf.net. Wishlist, shopping list and gift registry</title>
4.6 <link rel="shortcut icon" href="favicon.ico" />
4.7 - <wicket:link>
4.8 - <link rel="stylesheet" type="text/css" href="/styles/grid.css"/>
4.9 - <link rel="stylesheet" type="text/css" href="/styles/wish.css"/>
4.10 - <link rel="stylesheet" type="text/css" href="/styles/cargo.css"/>
4.11 - </wicket:link>
4.12 -</head>
4.13 + <link rel="stylesheet" type="text/css" href="styles/grid.css"/>
4.14 + <link rel="stylesheet" type="text/css" href="styles/wish.css"/>
4.15 + <link rel="stylesheet" type="text/css" href="styles/cargo.css"/>
4.16 + </head>
4.17
4.18 -<body>
4.19 - <div id="ocean" class="structure">
4.20 - <div id="lighthouse" class="structure">
4.21 - <div class="compartment"></div>
4.22 - </div>
4.23 - <div id="fleet" class="structure">
4.24 - <div id="regatta" class="structure">
4.25 - <div id="tug" class="structure">
4.26 - <div class="compartment">
4.27 - <wicket:link><img src="/images/leaderboard.gif" alt=""/></wicket:link>
4.28 + <body>
4.29 + <div id="ocean" class="structure">
4.30 + <div id="lighthouse" class="structure">
4.31 + <div class="compartment"></div>
4.32 + </div>
4.33 + <div id="fleet" class="structure">
4.34 + <div id="regatta" class="structure">
4.35 + <div id="tug" class="structure">
4.36 + <div class="compartment">
4.37 + <wicket:link><img src="images/leaderboard.gif" alt=""/></wicket:link>
4.38 + </div>
4.39 </div>
4.40 - </div>
4.41 - <div id="ship" class="structure">
4.42 - <div id="prow" class="compartment"></div>
4.43 - <div id="hull" class="structure">
4.44 - <div id="vaka" class="structure">
4.45 - <div id="bow" class="compartment"> </div>
4.46 - <div id="lookout" class="compartment">
4.47 - <wicket:link>
4.48 - <a href="/wish/WishIndexPage">wish</a>
4.49 - <a href="#">shop</a>
4.50 - <a href="#">gift</a>
4.51 - </wicket:link>
4.52 - </div>
4.53 - <div id="keel" class="structure">
4.54 - <div id="port" class="compartment"> </div>
4.55 - <div id="innerhull" class="structure">
4.56 - <div id="jib" class="compartment" wicket:id="jib"> </div>
4.57 - <div id="bulkhead" class="structure">
4.58 - <div id="hatch" class="compartment" wicket:id="hatch"> </div>
4.59 - <div id="ballast" class="structure compartment">
4.60 - <div id="cargo" class="compartment">
4.61 -
4.62 -
4.63 - <wicket:child></wicket:child>
4.64 + <div id="ship" class="structure">
4.65 + <div id="figurehead" class="compartment"></div>
4.66 + <div id="hull" class="structure">
4.67 + <div id="vaka" class="structure">
4.68 + <div id="prow" class="compartment"> </div>
4.69 + <div id="bow" class="compartment"> </div>
4.70 + <div id="lookout" class="compartment">
4.71 + <wicket:link>
4.72 + <a href="/wish/WishIndexPage">wish</a>
4.73 + <a href="#">shop</a>
4.74 + <a href="#">gift</a>
4.75 + </wicket:link>
4.76 + </div>
4.77 + <div id="keel" class="structure">
4.78 + <div id="port" class="compartment"> </div>
4.79 + <div id="innerhull" class="structure">
4.80 + <div id="jib" class="compartment" wicket:id="jib"> </div>
4.81 + <div id="foremast" class="compartment"> </div>
4.82 + <div id="bulkhead" class="structure">
4.83 + <div id="hatch" class="compartment" wicket:id="hatch"> </div>
4.84 + <div id="ballast" class="structure compartment">
4.85 + <div id="cargo" class="compartment">
4.86
4.87
4.88 + <wicket:child></wicket:child>
4.89 +
4.90 +
4.91 + </div>
4.92 </div>
4.93 + <div id="deck" class="compartment"> </div>
4.94 </div>
4.95 - <div id="deck" class="compartment"> </div>
4.96 + <div id="funnel" class="compartment">
4.97 + <div wicket:id="feedback"></div>
4.98 + </div>
4.99 + <div id="bridge" class="compartment" wicket:id="bridge">
4.100 + <ul class="horizontal">
4.101 + <li><a href="http://flurdy.com/contact/">contact</a></li>
4.102 + <li><a href="http://code.flurdy.com">about</a></li>
4.103 + </ul>
4.104 + </div>
4.105 </div>
4.106 - <div id="cockpit" class="compartment" wicket:id="cockpit">
4.107 - <ul class="horizontal">
4.108 - <li><a href="http://flurdy.com/contact/">contact</a></li>
4.109 - <li><a href="http://code.flurdy.com">about</a></li>
4.110 - </ul>
4.111 - </div>
4.112 + <div id="starboard" class="compartment"> </div>
4.113 </div>
4.114 - <div id="starboard" class="compartment"> </div>
4.115 - </div>
4.116 - <div id="aft" class="compartment">
4.117 - <a href="http://wishlist.wiki.sourceforge.net/Contact">contact</a>
4.118 - <a href="http://wishlist.sourceforge.net">project website</a>
4.119 - <!--
4.120 + <div id="aft" class="compartment">
4.121 + </div>
4.122 + <div id="stern" class="compartment">
4.123 + <a href="http://wishlist.wiki.sourceforge.net/Contact">contact</a>
4.124 + <a href="http://wishlist.sourceforge.net">project website</a>
4.125 + <!--
4.126 <a href="http://sourceforge.net/projects/wishlist">project</a>
4.127 <a href="http://wishlist.sourceforge.net">website</a>
4.128 <a href="http://wishlist.wiki.sourceforge.net">wiki</a>
4.129 <a href="http://apps.sourceforge.net/wordpress/wishlist">blog</a>
4.130 <a href="http://wishlist.wiki.sourceforge.net">license</a>
4.131 -->
4.132 + </div>
4.133 + <div id="flag" class="compartment"> </div>
4.134 </div>
4.135 - <div id="stern" class="compartment"> </div>
4.136 </div>
4.137 - </div>
4.138 - <div id="anchor" class="compartment">
4.139 - <div class="fleft" title="Version 5.1αlpha-m1">v5.1α</div>
4.140 - <!--
4.141 + <div id="anchor" class="compartment">
4.142 + <div class="fleft" title="Version 5.1αlpha-m1">v5.1α</div>
4.143 + <!--
4.144 <div class="right">
4.145 <a href="http://wishlist.wiki.sourceforge.net" title="Affero GPL v3">license</a>
4.146 </div>
4.147 -->
4.148 + </div>
4.149 </div>
4.150 - </div>
4.151 - <div id="ama" class="structure">
4.152 - <div class="compartment">
4.153 - <wicket:link><img src="/images/wideskyscraper.gif" alt=""/></wicket:link>
4.154 + <div id="ama" class="structure">
4.155 + <div class="compartment">
4.156 + <wicket:link><img src="/images/wideskyscraper.gif" alt=""/></wicket:link>
4.157 + </div>
4.158 </div>
4.159 - </div>
4.160 - <div id="net" class="structure">
4.161 - <div class="compartment">
4.162 - <wicket:link><img src="/images/leaderboard_img.jpg" alt=""/></wicket:link>
4.163 + <div id="net" class="structure">
4.164 + <div class="compartment">
4.165 + <wicket:link><img src="/images/leaderboard_img.jpg" alt=""/></wicket:link>
4.166 + </div>
4.167 </div>
4.168 </div>
4.169 </div>
4.170 + <div id="buoy" class="structure">
4.171 + <div class="compartment"> </div>
4.172 + </div>
4.173 </div>
4.174 - <div id="buoy" class="structure">
4.175 - <div class="compartment"> </div>
4.176 - </div>
4.177 - </div>
4.178
4.179 -
4.180 -<!--[if IE 6]>
4.181 - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
4.182 - <script type="text/javascript">
4.183 - var __noconflict = true;
4.184 - var IE6UPDATE_OPTIONS = {
4.185 - icons_path: "http://static.ie6update.com/hosted/ie6update/images/",
4.186 - url: "http://getfirefox.com"
4.187 - }
4.188 - </script>
4.189 - <script type="text/javascript" src="http://static.ie6update.com/hosted/ie6update/ie6update.js"></script>
4.190 -<![endif]-->
4.191 -
4.192 -
4.193 - <!-- ANALYTICS GO HERE -->
4.194 -
4.195 + <wicket:container wicket:id="dragons" class="structure"></wicket:container>
4.196 </body>
4.197 -<!-- copyright & copyleft, see website wishlist.sf.net -->
4.198 +<!-- copyright & copyleft, see website http://wishlist.sf.net -->
4.199 </html>
4.200
5.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.java Fri Oct 09 12:11:54 2009 +0200
5.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.java Tue Oct 27 23:02:41 2009 +0100
5.3 @@ -1,7 +1,13 @@
5.4 package net.sf.wishlist.enterprise.client.web.wicket;
5.5
5.6 +import com.flurdy.grid.nautical.NauticalGrid;
5.7 +import com.flurdy.grid.wicket.panel.DragonsPanel;
5.8 import org.apache.wicket.PageParameters;
5.9 +import org.apache.wicket.markup.html.WebMarkupContainer;
5.10 import org.apache.wicket.markup.html.WebPage;
5.11 +import org.apache.wicket.markup.html.panel.FeedbackPanel;
5.12 +import org.apache.wicket.markup.html.panel.Panel;
5.13 +import org.apache.wicket.protocol.http.WebRequest;
5.14 import org.slf4j.Logger;
5.15 import org.slf4j.LoggerFactory;
5.16
5.17 @@ -10,10 +16,11 @@
5.18 protected static final String DECK_ID = "deck";
5.19 protected static final String HATCH_ID = "hatch";
5.20 protected static final String JIB_ID = "jib";
5.21 - protected static final String COCKPIT_ID = "cockpit";
5.22 - protected static final String KEEL_ID = "keel";
5.23 -
5.24 - protected transient Logger log = LoggerFactory.getLogger(this.getClass());
5.25 + protected static final String BRIDGE_ID = "bridge";
5.26 + protected static final String FEEDBACK_ID = "feedback";
5.27 +
5.28 +// protected finalstatic Logger log = LoggerFactory.getLogger(BasePage.class);
5.29 + protected final Logger log = LoggerFactory.getLogger(this.getClass());
5.30
5.31 public BasePage(){
5.32 super();
5.33 @@ -26,7 +33,23 @@
5.34 }
5.35
5.36 private void addLayout(){
5.37 - add( new KeelPanel(COCKPIT_ID));
5.38 + addOrReplace( new JibPanel() );
5.39 +
5.40 + WebMarkupContainer hatchPanel = new WebMarkupContainer(NauticalGrid.HATCH.getWicketId());
5.41 + hatchPanel.setVisible(false);
5.42 + add(hatchPanel);
5.43 +// addOrReplace( new WebMarkupContainer(NauticalGrid.BRIDGE.getWicketId())); // new BridgePanel() );
5.44 + addOrReplace( new BridgePanel( NauticalGrid.BRIDGE.getWicketId() ) );
5.45 +
5.46 + Panel dragonsPanel = new DragonsPanel(isFrontPage(), isTestSite(), ((WishlistApplication)getApplication()).getAnalyticsId());
5.47 + add(dragonsPanel);
5.48 + dragonsPanel.setOutputMarkupPlaceholderTag(false);
5.49 + dragonsPanel.setRenderBodyOnly(true);
5.50 +
5.51 + add( new FeedbackPanel(FEEDBACK_ID));
5.52 +
5.53 +
5.54 +
5.55 // add( new BookmarkablePageLink("lookoutLinkWish",WishIndexPage.class));
5.56 // add( new Link("lookoutLinkShop"){
5.57 // @Override
5.58 @@ -42,5 +65,18 @@
5.59 // });
5.60
5.61 }
5.62 -
5.63 +
5.64 +
5.65 + private boolean isFrontPage() {
5.66 + return (getPage() instanceof IndexPage);
5.67 + }
5.68 +
5.69 + private boolean isTestSite() {
5.70 + String serverName = ((WebRequest) getRequest()).getHttpServletRequest().getServerName();
5.71 + if (serverName.equals("localhost")) {
5.72 + return true;
5.73 + } else {
5.74 + return false;
5.75 + }
5.76 + }
5.77 }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BridgePanel.html Tue Oct 27 23:02:41 2009 +0100
6.3 @@ -0,0 +1,24 @@
6.4 +<html>
6.5 +<body>
6.6 +<wicket:panel>
6.7 +
6.8 +
6.9 +<div wicket:id="logInOut"></div>
6.10 +
6.11 +<wicket:fragment wicket:id="notLoggedInFragment">
6.12 +
6.13 + <a href="#" wicket:id="loginLink">log in</a> /
6.14 + <a href="#" wicket:id="registerLink">register</a>
6.15 +
6.16 +</wicket:fragment>
6.17 +
6.18 +<wicket:fragment wicket:id="loggedInFragment">
6.19 +
6.20 + <span wicket:id="usernameLabel">ola normann</span> |
6.21 + <a href="#" wicket:id="logoutLink">log out</a>
6.22 +
6.23 +</wicket:fragment>
6.24 +
6.25 +</wicket:panel>
6.26 +</body>
6.27 +</html>
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BridgePanel.java Tue Oct 27 23:02:41 2009 +0100
7.3 @@ -0,0 +1,62 @@
7.4 +/*
7.5 + * To change this template, choose Tools | Templates
7.6 + * and open the template in the editor.
7.7 + */
7.8 +
7.9 +package net.sf.wishlist.enterprise.client.web.wicket;
7.10 +
7.11 +import org.apache.wicket.markup.html.basic.Label;
7.12 +import org.apache.wicket.markup.html.link.BookmarkablePageLink;
7.13 +import org.apache.wicket.markup.html.link.Link;
7.14 +import org.apache.wicket.markup.html.panel.Fragment;
7.15 +import org.apache.wicket.markup.html.panel.Panel;
7.16 +import org.slf4j.Logger;
7.17 +import org.slf4j.LoggerFactory;
7.18 +import org.springframework.security.context.SecurityContextHolder;
7.19 +import org.springframework.security.userdetails.UserDetails;
7.20 +
7.21 +public class BridgePanel extends Panel {
7.22 +
7.23 + protected static final Logger log = LoggerFactory.getLogger(BridgePanel.class);
7.24 +
7.25 + public BridgePanel(String id) {
7.26 + super(id);
7.27 +
7.28 + if( AuthenticatedWishlistSession.get().isSignedIn() ){
7.29 + add( new LogoutFragment("logInOut"));
7.30 + } else {
7.31 + add( new LoginFragment("logInOut"));
7.32 + }
7.33 +
7.34 + }
7.35 +
7.36 + private static class LoginFragment extends Fragment {
7.37 + public LoginFragment(String id) {
7.38 + super(id,"notLoggedInFragment");
7.39 + add( new BookmarkablePageLink("loginLink", LoginPage.class) );
7.40 + add( new BookmarkablePageLink("registerLink", RegisterPage.class) );
7.41 + }
7.42 + }
7.43 +
7.44 + private static class LogoutFragment extends Fragment {
7.45 +
7.46 + public LogoutFragment(String id) {
7.47 + super(id,"loggedInFragment");
7.48 +
7.49 + String username = AuthenticatedWishlistSession.get().getUsername();
7.50 +
7.51 + add( new Label("usernameLabel", username ));
7.52 +
7.53 + add( new Link("logoutLink"){
7.54 + @Override
7.55 + public void onClick() {
7.56 + AuthenticatedWishlistSession.get().signOut();
7.57 + AuthenticatedWishlistSession.get().invalidate();
7.58 + setRedirect(true);
7.59 + setResponsePage(IndexPage.class);
7.60 + }
7.61 + });
7.62 + }
7.63 + }
7.64 +
7.65 +}
8.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/JibPanel.java Fri Oct 09 12:11:54 2009 +0200
8.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/JibPanel.java Tue Oct 27 23:02:41 2009 +0100
8.3 @@ -7,10 +7,26 @@
8.4
8.5 import org.apache.wicket.markup.html.basic.Label;
8.6 import org.apache.wicket.markup.html.panel.Panel;
8.7 +import com.flurdy.grid.nautical.NauticalGrid;
8.8
8.9 public class JibPanel extends Panel {
8.10 +
8.11 + private static final String LABEL_ID = "cockpitLabel";
8.12 +
8.13 public JibPanel(String id, String label) {
8.14 super(id);
8.15 - add(new Label("cockpitLabel", label));
8.16 + add(new Label(LABEL_ID, label));
8.17 + }
8.18 +
8.19 +
8.20 + public JibPanel( String label) {
8.21 + super(NauticalGrid.JIB.getWicketId());
8.22 + add(new Label(LABEL_ID, label));
8.23 + }
8.24 +
8.25 + public JibPanel() {
8.26 + super(NauticalGrid.JIB.getWicketId());
8.27 + add(new Label(LABEL_ID, ""));
8.28 + setVisible(false);
8.29 }
8.30 }
9.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/KeelPanel.html Fri Oct 09 12:11:54 2009 +0200
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,24 +0,0 @@
9.4 -<html>
9.5 -<body>
9.6 -<wicket:panel>
9.7 -
9.8 -
9.9 -<div wicket:id="logInOut"></div>
9.10 -
9.11 -<wicket:fragment wicket:id="notLoggedInFragment">
9.12 -
9.13 - <a href="#" wicket:id="loginLink">log in</a> /
9.14 - <a href="#" wicket:id="registerLink">register</a>
9.15 -
9.16 -</wicket:fragment>
9.17 -
9.18 -<wicket:fragment wicket:id="loggedInFragment">
9.19 -
9.20 - <span wicket:id="usernameLabel">ola normann</span> |
9.21 - <a href="#" wicket:id="logoutLink">log out</a>
9.22 -
9.23 -</wicket:fragment>
9.24 -
9.25 -</wicket:panel>
9.26 -</body>
9.27 -</html>
10.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/KeelPanel.java Fri Oct 09 12:11:54 2009 +0200
10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
10.3 @@ -1,62 +0,0 @@
10.4 -/*
10.5 - * To change this template, choose Tools | Templates
10.6 - * and open the template in the editor.
10.7 - */
10.8 -
10.9 -package net.sf.wishlist.enterprise.client.web.wicket;
10.10 -
10.11 -import org.apache.wicket.markup.html.basic.Label;
10.12 -import org.apache.wicket.markup.html.link.BookmarkablePageLink;
10.13 -import org.apache.wicket.markup.html.link.Link;
10.14 -import org.apache.wicket.markup.html.panel.Fragment;
10.15 -import org.apache.wicket.markup.html.panel.Panel;
10.16 -import org.slf4j.Logger;
10.17 -import org.slf4j.LoggerFactory;
10.18 -import org.springframework.security.context.SecurityContextHolder;
10.19 -import org.springframework.security.userdetails.UserDetails;
10.20 -
10.21 -public class KeelPanel extends Panel {
10.22 -
10.23 - protected static final Logger log = LoggerFactory.getLogger(KeelPanel.class);
10.24 -
10.25 - public KeelPanel(String id) {
10.26 - super(id);
10.27 -
10.28 - if( AuthenticatedWishlistSession.get().isSignedIn() ){
10.29 - add( new LogoutFragment("logInOut"));
10.30 - } else {
10.31 - add( new LoginFragment("logInOut"));
10.32 - }
10.33 -
10.34 - }
10.35 -
10.36 - private static class LoginFragment extends Fragment {
10.37 - public LoginFragment(String id) {
10.38 - super(id,"notLoggedInFragment");
10.39 - add( new BookmarkablePageLink("loginLink", LoginPage.class) );
10.40 - add( new BookmarkablePageLink("registerLink", RegisterPage.class) );
10.41 - }
10.42 - }
10.43 -
10.44 - private static class LogoutFragment extends Fragment {
10.45 -
10.46 - public LogoutFragment(String id) {
10.47 - super(id,"loggedInFragment");
10.48 -
10.49 - String username = AuthenticatedWishlistSession.get().getUsername();
10.50 -
10.51 - add( new Label("usernameLabel", username ));
10.52 -
10.53 - add( new Link("logoutLink"){
10.54 - @Override
10.55 - public void onClick() {
10.56 - AuthenticatedWishlistSession.get().signOut();
10.57 - AuthenticatedWishlistSession.get().invalidate();
10.58 - setRedirect(true);
10.59 - setResponsePage(IndexPage.class);
10.60 - }
10.61 - });
10.62 - }
10.63 - }
10.64 -
10.65 -}
11.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.html Fri Oct 09 12:11:54 2009 +0200
11.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.html Tue Oct 27 23:02:41 2009 +0100
11.3 @@ -50,7 +50,6 @@
11.4
11.5 <img src="images/blank.gif" width="1" height="300" align="left"/>
11.6
11.7 -<div wicket:id="feedback"></div>
11.8
11.9 <form wicket:id="loginForm">
11.10 <table>
12.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Fri Oct 09 12:11:54 2009 +0200
12.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Tue Oct 27 23:02:41 2009 +0100
12.3 @@ -38,8 +38,8 @@
12.4 }
12.5
12.6 private void addLayout() {
12.7 - add( new JibPanel(JIB_ID,"login"));
12.8 - add( new WebMarkupContainer(HATCH_ID));
12.9 + addOrReplace( new JibPanel("login"));
12.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
12.11 add( new Link("registerLink"){
12.12 @Override
12.13 public void onClick() {
12.14 @@ -50,9 +50,7 @@
12.15 }
12.16
12.17 private void addCargo(){
12.18 - Form form = new LoginForm("loginForm");
12.19 - add(form);
12.20 - add(new FeedbackPanel("feedback"));
12.21 + add( new LoginForm("loginForm") );
12.22 }
12.23
12.24 class LoginForm extends StatelessForm {
13.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html Fri Oct 09 12:11:54 2009 +0200
13.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.html Tue Oct 27 23:02:41 2009 +0100
13.3 @@ -48,11 +48,6 @@
13.4
13.5
13.6
13.7 -
13.8 -<!-- <img src="images/blank.gif" width="1" height="300" align="left"/> -->
13.9 -
13.10 -<div wicket:id="feedback"></div>
13.11 -
13.12 <form wicket:id="registerForm">
13.13 <table>
13.14 <tr>
14.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Fri Oct 09 12:11:54 2009 +0200
14.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Tue Oct 27 23:02:41 2009 +0100
14.3 @@ -37,8 +37,8 @@
14.4 }
14.5
14.6 private void addLayout() {
14.7 - add( new JibPanel(JIB_ID,"register"));
14.8 - add( new WebMarkupContainer(HATCH_ID));
14.9 + addOrReplace( new JibPanel("register"));
14.10 +
14.11 add( new Link("loginLink"){
14.12 @Override
14.13 public void onClick() {
14.14 @@ -49,9 +49,7 @@
14.15 }
14.16
14.17 private void addCargo(){
14.18 - Form form = new RegisterForm("registerForm");
14.19 - add(form);
14.20 - add(new FeedbackPanel("feedback"));
14.21 + add( new RegisterForm("registerForm") );
14.22 }
14.23
14.24 class RegisterForm extends StatelessForm {
15.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/WishlistApplication.java Fri Oct 09 12:11:54 2009 +0200
15.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/WishlistApplication.java Tue Oct 27 23:02:41 2009 +0100
15.3 @@ -37,6 +37,16 @@
15.4
15.5 boolean isInitialized = false;
15.6
15.7 + private String analyticsId;
15.8 +
15.9 + public String getAnalyticsId() {
15.10 + return analyticsId;
15.11 + }
15.12 +
15.13 + public void setAnalyticsId(String analyticsId) {
15.14 + this.analyticsId = analyticsId;
15.15 + }
15.16 +
15.17 public WishlistApplication() { }
15.18
15.19 @Override
16.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Fri Oct 09 12:11:54 2009 +0200
16.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Tue Oct 27 23:02:41 2009 +0100
16.3 @@ -21,8 +21,8 @@
16.4 }
16.5
16.6 private void addLayout() {
16.7 - add( new JibPanel(JIB_ID,"access denied"));
16.8 - add( new WebMarkupContainer(HATCH_ID));
16.9 + addOrReplace( new JibPanel(JIB_ID,"access denied"));
16.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
16.11 addCargo();
16.12 }
16.13
17.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Fri Oct 09 12:11:54 2009 +0200
17.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Tue Oct 27 23:02:41 2009 +0100
17.3 @@ -31,8 +31,8 @@
17.4 }
17.5
17.6 private void addLayout() {
17.7 - add( new JibPanel(JIB_ID,"application error"));
17.8 - add( new WebMarkupContainer(HATCH_ID));
17.9 + addOrReplace( new JibPanel(JIB_ID,"application error"));
17.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
17.11 }
17.12
17.13 private void addCargo() {
18.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Fri Oct 09 12:11:54 2009 +0200
18.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Tue Oct 27 23:02:41 2009 +0100
18.3 @@ -21,8 +21,8 @@
18.4 }
18.5
18.6 private void addLayout() {
18.7 - add( new JibPanel(JIB_ID,"page expired"));
18.8 - add( new WebMarkupContainer(HATCH_ID));
18.9 + addOrReplace( new JibPanel(JIB_ID,"page expired"));
18.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
18.11 addCargo();
18.12 }
18.13
19.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Fri Oct 09 12:11:54 2009 +0200
19.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Tue Oct 27 23:02:41 2009 +0100
19.3 @@ -38,8 +38,8 @@
19.4 }
19.5
19.6 private void addLayout() {
19.7 - add( new JibPanel(JIB_ID,"404: not found"));
19.8 - add( new WebMarkupContainer(HATCH_ID));
19.9 + addOrReplace( new JibPanel(JIB_ID,"404: not found"));
19.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
19.11 // add( new WebMarkupContainer(DECK_ID));
19.12 addCargo();
19.13 }
20.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Fri Oct 09 12:11:54 2009 +0200
20.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Tue Oct 27 23:02:41 2009 +0100
20.3 @@ -30,8 +30,8 @@
20.4 }
20.5
20.6 private void addLayout() {
20.7 - add( new JibPanel(JIB_ID,"500: system error"));
20.8 - add( new WebMarkupContainer(HATCH_ID));
20.9 + addOrReplace( new JibPanel(JIB_ID,"500: system error"));
20.10 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
20.11 }
20.12
20.13 private void addCargo(){
21.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.html Fri Oct 09 12:11:54 2009 +0200
21.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.html Tue Oct 27 23:02:41 2009 +0100
21.3 @@ -3,10 +3,6 @@
21.4 <wicket:extend>
21.5
21.6
21.7 -
21.8 -<div wicket:id="feedback"></div>
21.9 -
21.10 -
21.11 <form wicket:id="addWishForm">
21.12 <table>
21.13 <tr>
22.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java Fri Oct 09 12:11:54 2009 +0200
22.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java Tue Oct 27 23:02:41 2009 +0100
22.3 @@ -5,10 +5,10 @@
22.4
22.5 package net.sf.wishlist.enterprise.client.web.wicket.wish;
22.6
22.7 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
22.8 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
22.9 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
22.10 +import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
22.11 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
22.12 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
22.13 import net.sf.wishlist.enterprise.common.domain.Dreamer;
22.14 import net.sf.wishlist.enterprise.common.domain.WishItem;
22.15 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
22.16 @@ -17,66 +17,62 @@
22.17 import org.apache.wicket.markup.html.form.Form;
22.18 import org.apache.wicket.markup.html.form.TextArea;
22.19 import org.apache.wicket.markup.html.form.TextField;
22.20 -import org.apache.wicket.markup.html.panel.FeedbackPanel;
22.21 -import org.apache.wicket.markup.html.panel.Fragment;
22.22 import org.apache.wicket.model.CompoundPropertyModel;
22.23 import org.apache.wicket.model.IModel;
22.24 +import org.slf4j.Logger;
22.25 +import org.slf4j.LoggerFactory;
22.26
22.27 @AuthorizeInstantiation("ROLE_DREAMER")
22.28 public class WishAddPage extends WishPage {
22.29
22.30 +// private final static Logger log = LoggerFactory.getLogger(BasePage.class);
22.31
22.32 public WishAddPage() {
22.33 super();
22.34 addLayout();
22.35 - log.debug("adding wish no parameters");
22.36 +// log.debug("adding wish no parameters");
22.37 }
22.38
22.39 public WishAddPage(final PageParameters parameters) {
22.40 super(parameters);
22.41 - log.debug("adding wish parameters");
22.42 +// log.debug("adding wish parameters");
22.43 addLayout();
22.44 }
22.45
22.46 - private void addLayout() {
22.47 - add( new JibPanel(JIB_ID,"wish add"));
22.48 - // add( new HatchFragement("hatch"));
22.49 - add( new WishDeckPanel(HATCH_ID));
22.50 -// add( new KeelPanel("keel"));
22.51 + private void addLayout() {
22.52 + log.error("#¤%&");
22.53 + addOrReplace( new JibPanel("wish add"));
22.54 + addOrReplace( new WishItemMenuPanel(HATCH_ID));
22.55 addCargo();
22.56 }
22.57
22.58 -
22.59 - public class HatchFragement extends Fragment{
22.60 - public HatchFragement(String id){
22.61 - super(id, "hatchFragment", WishAddPage.this);
22.62 - }
22.63 - }
22.64
22.65
22.66 private void addCargo(){
22.67 - Form form = new AddWishForm("addWishForm", new CompoundPropertyModel(new WishItem()));
22.68 + Form<WishItem> form = new AddWishForm("addWishForm", new CompoundPropertyModel<WishItem>(new WishItem()));
22.69 add(form);
22.70 - form.add(new TextField("title"));
22.71 - form.add(new TextArea("description"));
22.72 - form.add(new TextField("stringTags"));
22.73 - add(new FeedbackPanel("feedback"));
22.74 + form.add(new TextField<String>("title"));
22.75 + form.add(new TextArea<String>("description"));
22.76 + form.add(new TextField<String>("stringTags"));
22.77 +// add(new FeedbackPanel("feedback"));
22.78 }
22.79
22.80
22.81 - class AddWishForm extends Form {
22.82 + class AddWishForm extends Form<WishItem> {
22.83
22.84 - public AddWishForm(String id, IModel model){
22.85 + public AddWishForm(String id, IModel<WishItem> model){
22.86 super(id,model);
22.87 }
22.88
22.89 @Override
22.90 public void onSubmit(){
22.91 //log.debug("adding wish");
22.92 - WishItem wish = (WishItem) getModelObject();
22.93 + WishItem wish = getModelObject();
22.94 if( wish !=null && wish.getTitle() != null ){
22.95 if ( wish.getTitle().length()>0 ){
22.96 //log.debug("wish title is " + wish.getTitle());
22.97 + if(log==null)
22.98 + throw new RuntimeException("log is null");
22.99 log.info("adding wish: " + wish);
22.100
22.101 Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
22.102 @@ -109,8 +105,8 @@
22.103 warn("No title entered");
22.104 }
22.105 } else {
22.106 - log.info("no wish");
22.107 - error("Error");
22.108 + log.info("No wish supplied");
22.109 + error("No wish supplied");
22.110 }
22.111 }
22.112
23.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.html Fri Oct 09 12:11:54 2009 +0200
23.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.html Tue Oct 27 23:02:41 2009 +0100
23.3 @@ -2,8 +2,6 @@
23.4 <wicket:extend>
23.5
23.6
23.7 - <div wicket:id="feedback">feedback</div>
23.8 -
23.9 <form wicket:id="editWishForm">
23.10 <input type="hidden" wicket:id="wishId"/>
23.11 <table>
24.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java Fri Oct 09 12:11:54 2009 +0200
24.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java Tue Oct 27 23:02:41 2009 +0100
24.3 @@ -3,8 +3,7 @@
24.4 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagEditPoolPanel;
24.5 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
24.6 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
24.7 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
24.8 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
24.9 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
24.10 import net.sf.wishlist.enterprise.common.domain.Dreamer;
24.11 import net.sf.wishlist.enterprise.common.domain.WishItem;
24.12 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
24.13 @@ -27,9 +26,8 @@
24.14
24.15 private void addLayout(LoadableWishItemModel wishModel) {
24.16 WishItem wish = (WishItem)wishModel.getObject();
24.17 - add(new JibPanel(JIB_ID, "edit wish"));
24.18 - add(new WishDeckPanel(HATCH_ID, wish));
24.19 -// add(new KeelPanel("keel"));
24.20 + addOrReplace(new JibPanel(JIB_ID, "edit wish"));
24.21 + addOrReplace(new WishItemMenuPanel(HATCH_ID, wish));
24.22 Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
24.23 wish = wishServiceAdapter.findWish(wish.getWishId(), dreamer);
24.24 wishModel.detach();
24.25 @@ -37,31 +35,31 @@
24.26 }
24.27
24.28 private void addCargo(LoadableWishItemModel wishModel) {
24.29 - add(new FeedbackPanel("feedback"));
24.30 +// add(new FeedbackPanel("feedback"));
24.31 //WishItem wish = (WishItem)wishModel.getObject();
24.32
24.33 - CompoundPropertyModel wishPropertyModel = new CompoundPropertyModel(wishModel);
24.34 + CompoundPropertyModel<WishItem> wishPropertyModel = new CompoundPropertyModel<WishItem>(wishModel);
24.35
24.36 - Form form = new EditWishForm("editWishForm", wishPropertyModel );
24.37 + Form<WishItem> form = new EditWishForm("editWishForm", wishPropertyModel );
24.38 add(form);
24.39 - form.add(new HiddenField("wishId"));
24.40 - form.add(new TextField("title"));
24.41 - form.add(new TextArea("description"));
24.42 + form.add(new HiddenField<Long>("wishId"));
24.43 + form.add(new TextField<String>("title"));
24.44 + form.add(new TextArea<String>("description"));
24.45 add( new AddTagForm( "addTagForm", wishPropertyModel ));
24.46 wishModel.detach();
24.47 add(new TagEditPoolPanel("tagPool", wishModel));
24.48 }
24.49
24.50 - private class AddTagForm extends Form {
24.51 - private AddTagForm(String id, IModel wishModel) {
24.52 + private class AddTagForm extends Form<WishItem> {
24.53 + private AddTagForm(String id, IModel<WishItem> wishModel) {
24.54 super(id,wishModel);
24.55 - add(new HiddenField("wishId"));
24.56 - add(new TextField("stringTags"));
24.57 + add(new HiddenField<Long>("wishId"));
24.58 + add(new TextField<String>("stringTags"));
24.59 }
24.60
24.61 @Override
24.62 public void onSubmit() {
24.63 - WishItem wish = (WishItem) getModelObject();
24.64 + WishItem wish = getModelObject();
24.65 if (wish != null && wish.getStringTags() != null) {
24.66 if (wish.getStringTags().length() > 0) {
24.67 log.info("updating wish by adding tags: " + wish);
24.68 @@ -101,16 +99,16 @@
24.69
24.70 }
24.71
24.72 - class EditWishForm extends Form {
24.73 + class EditWishForm extends Form<WishItem> {
24.74
24.75 - public EditWishForm(String id, IModel model) {
24.76 + public EditWishForm(String id, IModel<WishItem> model) {
24.77 super(id, model);
24.78 }
24.79
24.80 @Override
24.81 public void onSubmit() {
24.82 //log.debug("updating wish");
24.83 - WishItem wish = (WishItem) getModelObject();
24.84 + WishItem wish = getModelObject();
24.85 if (wish != null && wish.getTitle() != null) {
24.86 if (wish.getTitle().length() > 0) {
24.87 //log.debug("wish title is " + wish.getTitle());
25.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.html Fri Oct 09 12:11:54 2009 +0200
25.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.html Tue Oct 27 23:02:41 2009 +0100
25.3 @@ -41,6 +41,9 @@
25.4 </td>
25.5 </tr>
25.6
25.7 + <tr>
25.8 +
25.9 + <td id="cargo" class="grid" colspan="1" rowspan="1">
25.10 <wicket:extend>
25.11 <!--
25.12 <tr>
25.13 @@ -58,7 +61,8 @@
25.14
25.15 -->
25.16
25.17 -<img src="images/blank.gif" width="1" height="300" align="left"/>
25.18 +<img alt="" src="images/blank.gif" width="1" height="300" align="left"/>
25.19 +
25.20
25.21 <!--
25.22 <table border="1" id="searchBox">
25.23 @@ -213,7 +217,8 @@
25.24 </tr>
25.25 -->
25.26 </wicket:extend>
25.27 -
25.28 +</td>
25.29 + </tr>
25.30 <tr>
25.31 <td id="stern" class="grid" colspan="3" rowspan="1">
25.32 </td>
26.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.java Fri Oct 09 12:11:54 2009 +0200
26.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.java Tue Oct 27 23:02:41 2009 +0100
26.3 @@ -1,16 +1,17 @@
26.4 package net.sf.wishlist.enterprise.client.web.wicket.wish;
26.5
26.6 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
26.7 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
26.8 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishPoolPanel;
26.9 import java.util.Set;
26.10 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
26.11 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
26.12 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
26.13 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagPoolPanel;
26.14 import net.sf.wishlist.enterprise.common.domain.Tag;
26.15 import net.sf.wishlist.enterprise.common.domain.WishItem;
26.16 import org.apache.wicket.PageParameters;
26.17 import org.apache.wicket.markup.html.WebMarkupContainer;
26.18 +import org.slf4j.Logger;
26.19 +import org.slf4j.LoggerFactory;
26.20
26.21 public class WishIndexPage extends WishPage {
26.22
26.23 @@ -19,6 +20,8 @@
26.24 private static final String TAGPOOL_WRAP_ID = "tagPoolWrap";
26.25 private static final String MY_TAGPOOL_BOX_ID = "myTagPoolBox";
26.26
26.27 +// private final static Logger log = LoggerFactory.getLogger(WishIndexPage.class);
26.28 +
26.29 public WishIndexPage() {
26.30 super();
26.31 addLayout();
26.32 @@ -30,8 +33,9 @@
26.33 }
26.34
26.35 private void addLayout() {
26.36 - add(new JibPanel(JIB_ID, "wish"));
26.37 - add(new WishDeckPanel(HATCH_ID));
26.38 + log.error("!!!");
26.39 + addOrReplace(new JibPanel(JIB_ID, "wish"));
26.40 + addOrReplace(new WishItemMenuPanel(HATCH_ID));
26.41 addCargo();
26.42 }
26.43
27.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.html Fri Oct 09 12:11:54 2009 +0200
27.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.html Tue Oct 27 23:02:41 2009 +0100
27.3 @@ -1,8 +1,6 @@
27.4 <html>
27.5 <wicket:extend>
27.6
27.7 - <div wicket:id="feedback">feedback</div>
27.8 -
27.9 <form wicket:id="removeWishForm">
27.10 <input type="hidden" wicket:id="wishId"/>
27.11 <table>
28.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java Fri Oct 09 12:11:54 2009 +0200
28.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java Tue Oct 27 23:02:41 2009 +0100
28.3 @@ -2,8 +2,8 @@
28.4
28.5 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
28.6 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
28.7 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
28.8 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
28.9 +import net.sf.wishlist.enterprise.client.web.wicket.BridgePanel;
28.10 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
28.11 import net.sf.wishlist.enterprise.common.domain.Dreamer;
28.12 import net.sf.wishlist.enterprise.common.domain.WishItem;
28.13 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
28.14 @@ -25,14 +25,14 @@
28.15 }
28.16
28.17 private void addLayout(WishItem wish) {
28.18 - add(new JibPanel(JIB_ID, "remove wish"));
28.19 - add(new WishDeckPanel(HATCH_ID, wish));
28.20 -// add(new KeelPanel("keel"));
28.21 + addOrReplace(new JibPanel(JIB_ID, "remove wish"));
28.22 + addOrReplace(new WishItemMenuPanel(HATCH_ID, wish));
28.23 +// add(new BridgePanel("keel"));
28.24 addCargo(wish);
28.25 }
28.26
28.27 private void addCargo(WishItem wish) {
28.28 - add(new FeedbackPanel("feedback"));
28.29 +// add(new FeedbackPanel("feedback"));
28.30 Form form = new EditWishForm("removeWishForm", new CompoundPropertyModel(wish));
28.31 add(form);
28.32 form.add(new HiddenField("wishId"));
29.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.html Fri Oct 09 12:11:54 2009 +0200
29.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.html Tue Oct 27 23:02:41 2009 +0100
29.3 @@ -47,9 +47,6 @@
29.4
29.5
29.6
29.7 -<div wicket:id="feedback"></div>
29.8 -
29.9 -
29.10 <table>
29.11 <tr>
29.12 <th>title</th>
30.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java Fri Oct 09 12:11:54 2009 +0200
30.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java Tue Oct 27 23:02:41 2009 +0100
30.3 @@ -7,7 +7,7 @@
30.4
30.5 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagPoolPanel;
30.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
30.7 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
30.8 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
30.9 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
30.10 import net.sf.wishlist.enterprise.common.domain.Dreamer;
30.11 import net.sf.wishlist.enterprise.common.domain.WishItem;
30.12 @@ -19,6 +19,8 @@
30.13
30.14 public class WishViewPage extends WishPage {
30.15
30.16 +// private final static Logger log = LoggerFactory.getLogger(BasePage.class);
30.17 +
30.18 public WishViewPage() {
30.19 super();
30.20 log.warn("view wish no parameters");
30.21 @@ -60,16 +62,16 @@
30.22 }
30.23
30.24 private void addLayout(LoadableWishItemModel wishModel) {
30.25 - add( new JibPanel(JIB_ID,"wish"));
30.26 + addOrReplace( new JibPanel(JIB_ID,"wish"));
30.27 WishItem wish = wishModel.getObject();
30.28 - add( new WishDeckPanel(HATCH_ID, wish));
30.29 + addOrReplace( new WishItemMenuPanel(HATCH_ID, wish));
30.30 // add( new KeelPanel("keel"));
30.31 addCargo(wishModel);
30.32 }
30.33
30.34 private void addCargo(LoadableWishItemModel wishModel){
30.35 WishItem wish = (WishItem)wishModel.getObject();
30.36 - add(new FeedbackPanel("feedback"));
30.37 +// add(new FeedbackPanel("feedback"));
30.38 setDefaultModel( new CompoundPropertyModel<WishItem>(wish));
30.39 add( new Label("title") );
30.40 add( new Label("description") );
31.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html Fri Oct 09 12:11:54 2009 +0200
31.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html Tue Oct 27 23:02:41 2009 +0100
31.3 @@ -1,6 +1,7 @@
31.4 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
31.5 <html>
31.6 <head>
31.7 + <link rel="stylesheet" type="text/css" href="../../../../styles/grid.css" />
31.8 <link rel="stylesheet" type="text/css" href="../../../../styles/wish.css" />
31.9 <link rel="stylesheet" type="text/css" href="../../../../styles/cargo.css" />
31.10 </head>
31.11 @@ -10,6 +11,23 @@
31.12
31.13 <wicket:extend>
31.14
31.15 + <form action="#" wicket:id="newWishlistForm">
31.16 + <table>
31.17 + <tr>
31.18 + <th>title</th>
31.19 + <td><input type="text" wicket:id="title"/></td>
31.20 + </tr>
31.21 + <tr>
31.22 + <th>description</th>
31.23 + <td><textarea cols="50" rows="6" wicket:id="description"></textarea></td>
31.24 + </tr>
31.25 + <tr>
31.26 + <td colspan="2"><input type="submit" value="update" /></td>
31.27 + </tr>
31.28 + </table>
31.29 + </form>
31.30 +
31.31 +
31.32 <div style="float: right; overflow: auto; padding: 1em; height: 40em;">
31.33 <table>
31.34 <tr>
31.35 @@ -68,21 +86,6 @@
31.36
31.37
31.38
31.39 - <form action="#" wicket:id="newWishlistForm">
31.40 - <table>
31.41 - <tr>
31.42 - <th>title</th>
31.43 - <td><input type="text" wicket:id="title"/></td>
31.44 - </tr>
31.45 - <tr>
31.46 - <th>description</th>
31.47 - <td><textarea wicket:id="description"></textarea></td>
31.48 - </tr>
31.49 - <tr>
31.50 - <td colspan="2"><input type="submit" value="update" /></td>
31.51 - </tr>
31.52 - </table>
31.53 - </form>
31.54
31.55 <table>
31.56 <tr>
31.57 @@ -127,9 +130,6 @@
31.58
31.59
31.60
31.61 - <div wicket:id="feedback"></div>
31.62 -
31.63 -
31.64 </wicket:extend>
31.65
31.66
32.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java Fri Oct 09 12:11:54 2009 +0200
32.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java Tue Oct 27 23:02:41 2009 +0100
32.3 @@ -32,15 +32,15 @@
32.4 }
32.5
32.6 private void addLayout(LoadableWishlistModel wishlistModel) {
32.7 - add(new JibPanel(JIB_ID, "edit wishlist"));
32.8 - add(new WishlistMenuPanel(wishlistModel));
32.9 + addOrReplace(new JibPanel(JIB_ID, "edit wishlist"));
32.10 + addOrReplace(new WishlistMenuPanel(wishlistModel));
32.11 wishlistModel.detach();
32.12 addCargo(wishlistModel);
32.13 }
32.14
32.15
32.16 private void addCargo(LoadableWishlistModel wishlistModel) {
32.17 - add(new FeedbackPanel("feedback"));
32.18 +// add(new FeedbackPanel("feedback"));
32.19
32.20 // log.debug("form dara" + wishlistModel.getObject());
32.21
33.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.html Fri Oct 09 12:11:54 2009 +0200
33.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.html Tue Oct 27 23:02:41 2009 +0100
33.3 @@ -62,9 +62,6 @@
33.4 </form>
33.5
33.6
33.7 - <div wicket:id="feedback"></div>
33.8 -
33.9 -
33.10
33.11 </wicket:extend>
33.12
34.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java Fri Oct 09 12:11:54 2009 +0200
34.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java Tue Oct 27 23:02:41 2009 +0100
34.3 @@ -7,7 +7,7 @@
34.4 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
34.5 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
34.6 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
34.7 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
34.8 +import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishItemMenuPanel;
34.9 import net.sf.wishlist.enterprise.common.domain.Dreamer;
34.10 import net.sf.wishlist.enterprise.common.domain.WishList;
34.11 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
34.12 @@ -32,15 +32,15 @@
34.13 }
34.14
34.15 private void addLayout() {
34.16 - add(new JibPanel(JIB_ID, "new wishlist"));
34.17 - add(new WishDeckPanel(HATCH_ID));
34.18 + addOrReplace(new JibPanel(JIB_ID, "new wishlist"));
34.19 +// add(new WishItemMenuPanel(HATCH_ID));
34.20 // add(new KeelPanel("keel"));
34.21 addCargo();
34.22 }
34.23
34.24 private void addCargo() {
34.25
34.26 - add(new FeedbackPanel("feedback"));
34.27 +// add(new FeedbackPanel("feedback"));
34.28
34.29 Form<WishList> form = new Form<WishList>(FORM_ID, new CompoundPropertyModel<WishList>(new WishList())) {
34.30
35.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.html Fri Oct 09 12:11:54 2009 +0200
35.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.html Tue Oct 27 23:02:41 2009 +0100
35.3 @@ -101,10 +101,6 @@
35.4
35.5
35.6
35.7 -
35.8 - <div wicket:id="feedback"></div>
35.9 -
35.10 -
35.11
35.12
35.13 </wicket:extend>
36.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java Fri Oct 09 12:11:54 2009 +0200
36.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java Tue Oct 27 23:02:41 2009 +0100
36.3 @@ -21,8 +21,8 @@
36.4 }
36.5
36.6 private void addLayout(LoadableWishlistModel wishlistModel) {
36.7 - add(new JibPanel( JIB_ID, "edit wishlist"));
36.8 - add(new WishlistMenuPanel(wishlistModel));
36.9 + addOrReplace(new JibPanel( JIB_ID, "wishlist"));
36.10 + addOrReplace(new WishlistMenuPanel(wishlistModel));
36.11 // add(new KeelPanel("keel"));
36.12 // Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
36.13 // WishList wishlist = wishlistModel.load();
36.14 @@ -32,7 +32,7 @@
36.15 }
36.16
36.17 private void addCargo(LoadableWishlistModel wishlistModel) {
36.18 - add(new FeedbackPanel("feedback"));
36.19 +// add(new FeedbackPanel("feedback"));
36.20 log.debug("viewing wishlist : " + wishlistModel.load());
36.21 setDefaultModel(new CompoundPropertyModel<WishList>(wishlistModel));
36.22 add(new Label("title"));
37.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/panel/WishDeckPanel.java Fri Oct 09 12:11:54 2009 +0200
37.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
37.3 @@ -1,73 +0,0 @@
37.4 -/*
37.5 - * To change this template, choose Tools | Templates
37.6 - * and open the template in the editor.
37.7 - */
37.8 -package net.sf.wishlist.enterprise.client.web.wicket.wish.panel;
37.9 -
37.10 -import net.sf.wishlist.enterprise.client.web.wicket.wish.*;
37.11 -import net.sf.wishlist.enterprise.client.web.wicket.DeckPanel;
37.12 -import net.sf.wishlist.enterprise.client.web.wicket.wish.list.NewWishlistPage;
37.13 -import net.sf.wishlist.enterprise.common.domain.WishItem;
37.14 -import net.sf.wishlist.enterprise.common.domain.WishList;
37.15 -import org.apache.wicket.markup.repeater.RepeatingView;
37.16 -
37.17 -public class WishDeckPanel extends DeckPanel {
37.18 -
37.19 - public WishDeckPanel(String id) {
37.20 - super(id);
37.21 - RepeatingView deckRows = new RepeatingView("deckRow");
37.22 - add(deckRows);
37.23 -
37.24 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("add wish") {
37.25 - @Override
37.26 - public void onClick() {
37.27 - setResponsePage(WishAddPage.class);
37.28 - }
37.29 - }));
37.30 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("new wish list") {
37.31 - @Override
37.32 - public void onClick() {
37.33 - setResponsePage(NewWishlistPage.class);
37.34 - }
37.35 - }));
37.36 - }
37.37 -
37.38 - public WishDeckPanel(String id, WishItem wish) {
37.39 - super(id);
37.40 - RepeatingView deckRows = new RepeatingView("deckRow");
37.41 - add(deckRows);
37.42 -
37.43 - LoadableWishItemModel wishModel = new LoadableWishItemModel(wish);
37.44 -
37.45 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("add wish") {
37.46 - @Override
37.47 - public void onClick() {
37.48 - setResponsePage(WishAddPage.class);
37.49 - }
37.50 - }));
37.51 -
37.52 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("view wish", wishModel) {
37.53 - @Override
37.54 - public void onClick() {
37.55 - setResponsePage(new WishViewPage((LoadableWishItemModel) getModel()));
37.56 - }
37.57 - }));
37.58 -
37.59 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("edit wish", wishModel) {
37.60 - @Override
37.61 - public void onClick() {
37.62 - setResponsePage(new WishEditPage((LoadableWishItemModel) getModel()));
37.63 - }
37.64 - }));
37.65 -
37.66 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("remove wish", wishModel) {
37.67 - @Override
37.68 - public void onClick() {
37.69 - setResponsePage(new WishRemovePage((WishItem) getModelObject()));
37.70 - }
37.71 - }));
37.72 -
37.73 -
37.74 - }
37.75 -
37.76 -}
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
38.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/panel/WishItemMenuPanel.java Tue Oct 27 23:02:41 2009 +0100
38.3 @@ -0,0 +1,73 @@
38.4 +/*
38.5 + * To change this template, choose Tools | Templates
38.6 + * and open the template in the editor.
38.7 + */
38.8 +package net.sf.wishlist.enterprise.client.web.wicket.wish.panel;
38.9 +
38.10 +import net.sf.wishlist.enterprise.client.web.wicket.wish.*;
38.11 +import net.sf.wishlist.enterprise.client.web.wicket.DeckPanel;
38.12 +import net.sf.wishlist.enterprise.client.web.wicket.wish.list.NewWishlistPage;
38.13 +import net.sf.wishlist.enterprise.common.domain.WishItem;
38.14 +import net.sf.wishlist.enterprise.common.domain.WishList;
38.15 +import org.apache.wicket.markup.repeater.RepeatingView;
38.16 +
38.17 +public class WishItemMenuPanel extends DeckPanel {
38.18 +
38.19 + public WishItemMenuPanel(String id) {
38.20 + super(id);
38.21 + RepeatingView deckRows = new RepeatingView("deckRow");
38.22 + add(deckRows);
38.23 +
38.24 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("add wish") {
38.25 + @Override
38.26 + public void onClick() {
38.27 + setResponsePage(WishAddPage.class);
38.28 + }
38.29 + }));
38.30 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("new wish list") {
38.31 + @Override
38.32 + public void onClick() {
38.33 + setResponsePage(NewWishlistPage.class);
38.34 + }
38.35 + }));
38.36 + }
38.37 +
38.38 + public WishItemMenuPanel(String id, WishItem wish) {
38.39 + super(id);
38.40 + RepeatingView deckRows = new RepeatingView("deckRow");
38.41 + add(deckRows);
38.42 +
38.43 + LoadableWishItemModel wishModel = new LoadableWishItemModel(wish);
38.44 +
38.45 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("add wish") {
38.46 + @Override
38.47 + public void onClick() {
38.48 + setResponsePage(WishAddPage.class);
38.49 + }
38.50 + }));
38.51 +
38.52 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("view wish", wishModel) {
38.53 + @Override
38.54 + public void onClick() {
38.55 + setResponsePage(new WishViewPage((LoadableWishItemModel) getModel()));
38.56 + }
38.57 + }));
38.58 +
38.59 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("edit wish", wishModel) {
38.60 + @Override
38.61 + public void onClick() {
38.62 + setResponsePage(new WishEditPage((LoadableWishItemModel) getModel()));
38.63 + }
38.64 + }));
38.65 +
38.66 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishItem>("remove wish", wishModel) {
38.67 + @Override
38.68 + public void onClick() {
38.69 + setResponsePage(new WishRemovePage((WishItem) getModelObject()));
38.70 + }
38.71 + }));
38.72 +
38.73 +
38.74 + }
38.75 +
38.76 +}
39.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java Fri Oct 09 12:11:54 2009 +0200
39.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java Tue Oct 27 23:02:41 2009 +0100
39.3 @@ -3,7 +3,7 @@
39.4 import java.util.Set;
39.5 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
39.6 import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
39.7 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
39.8 +import net.sf.wishlist.enterprise.client.web.wicket.BridgePanel;
39.9 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
39.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishPoolPanel;
39.11 import net.sf.wishlist.enterprise.common.domain.Dreamer;
39.12 @@ -22,15 +22,15 @@
39.13 }
39.14
39.15 private void addLayout(Tag tag){
39.16 - add( new JibPanel(JIB_ID,"tag"));
39.17 - add( new WebMarkupContainer(HATCH_ID));
39.18 + addOrReplace( new JibPanel(JIB_ID,"tag"));
39.19 +// addOrReplace( new WebMarkupContainer(HATCH_ID));
39.20 addCargo(tag);
39.21
39.22 }
39.23
39.24 private void addCargo(Tag tag){
39.25
39.26 -// add( new KeelPanel("keel"));
39.27 +// add( new BridgePanel("keel"));
39.28
39.29
39.30 Dreamer dreamerOrNone = AuthenticatedWishlistSession.get().getSessionDreamer();
40.1 --- a/wish-clients/wish-web/wish-wicket/src/main/resources/application.xml Fri Oct 09 12:11:54 2009 +0200
40.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/resources/application.xml Tue Oct 27 23:02:41 2009 +0100
40.3 @@ -15,7 +15,9 @@
40.4 <context:annotation-config />
40.5 <tx:annotation-driven/>
40.6
40.7 - <bean id="wicketApplication" class="net.sf.wishlist.enterprise.client.web.wicket.WishlistApplication" />
40.8 + <bean id="wicketApplication" class="net.sf.wishlist.enterprise.client.web.wicket.WishlistApplication">
40.9 + <property name="analyticsId" value="${analytics.id}"/>
40.10 + </bean>
40.11
40.12 <bean id="passwordEncoder" class="org.springframework.security.providers.encoding.ShaPasswordEncoder" />
40.13
41.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Fri Oct 09 12:11:54 2009 +0200
41.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Tue Oct 27 23:02:41 2009 +0100
41.3 @@ -11,10 +11,10 @@
41.4 .right{ text-align: right; }
41.5 .fleft{ float: left; }
41.6
41.7 -#lookout { font-size: 16pt; font-weight: bold; padding: 0.2em 1em 0.2em 4.5em; }
41.8 +#lookout { font-size: 16pt; font-weight: bold; padding: 0.2em 1em;/* 0.2em 4.5em; */ }
41.9 #lookout a { padding: 0.2em 2em; text-decoration: none;}
41.10
41.11 -#jib { font-size: 1.6em; font-weight: bold; padding: 0.2em 1em 0.2em 4.5em; }
41.12 +#jib { font-size: 1.6em; font-weight: bold; padding: 0.2em 1em; /*0.2em 4.5em;*/ }
41.13
41.14 #hatch { vertical-align: top; padding: 0.01em; }
41.15 #hatch ul { margin: 0.01em; padding: 0.01em; }
41.16 @@ -25,8 +25,8 @@
41.17 #deck ul li { list-style: none; text-align: center; padding: 5px; border: 3px outset silver; margin: 5px; }
41.18
41.19
41.20 -#aft { text-align: right; font-size: 9pt; }
41.21 -#aft a{ padding: 0 1em; }
41.22 +#stern { text-align: right; font-size: 9pt; }
41.23 +#stern a{ padding: 0 1em; }
41.24
41.25 #anchor { color: #ababab; font-size: 7pt; text-align: left; padding: 0em 2em; }
41.26 #anchor a, #anchor a:visited { color: #ababab; }
41.27 @@ -54,4 +54,11 @@
41.28 */
41.29
41.30 #cargo table { display: inline; }
41.31 -#cargo table th,#cargo table td{ border: 1px solid black; padding: 0.2em 1em; }
41.32 \ No newline at end of file
41.33 +#cargo table th,#cargo table td{ border: 1px solid black; padding: 0.2em 1em; }
41.34 +
41.35 +
41.36 +ul.feedbackPanel { text-align: center; border-top: 1px solid #999999; padding: 0.5em 0.2em; margin: 0; }
41.37 +ul.feedbackPanel li { list-style: none; font-size: 0.75em; }
41.38 +ul.feedbackPanel li.feedbackPanelINFO { color: #00aa00; }
41.39 +ul.feedbackPanel li.feedbackPanelWARNING { color: #cc6600; font-weight: bold; }
41.40 +ul.feedbackPanel li.feedbackPanelERROR { color: #aa0000; font-weight: bold; }
41.41 \ No newline at end of file
42.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Fri Oct 09 12:11:54 2009 +0200
42.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Tue Oct 27 23:02:41 2009 +0100
42.3 @@ -31,8 +31,8 @@
42.4 }
42.5
42.6 /* internal */
42.7 -#lookout, #cockpit, #stern, #aft { border-top: 1px solid #999999; }
42.8 -#lookout, #jib { border-bottom: 1px solid #999999; }
42.9 +#bridge, #stern, #aft, #flag { border-top: 1px solid #999999; }
42.10 +#lookout, #jib, #foremast { border-bottom: 1px solid #999999; }
42.11 #port, #hatch { border-right: 1px solid #999999; }
42.12 #starboard, #deck { border-left: 1px solid #999999; }
42.13
42.14 @@ -57,7 +57,7 @@
42.15 #starboard { width: 1em; min-width: 1em; }
42.16 #hatch { width: 8em; min-width: 8em; }
42.17 #deck { width: 1em; min-width: 1em; }
42.18 -#bow, #stern { height: 0.2em; }
42.19 +#bow, #flag { height: 0.2em; }
42.20 #ama { padding: 0.8em 0 0 1em; }
42.21 #tug > .compartment { margin: 0 0 0.5em 0; text-align: center; }
42.22 #net > .compartment { margin: 0.5em 0 0 0; text-align: center; }
42.23 @@ -68,6 +68,7 @@
42.24 #ama > .compartment > iframe, #ama > .compartment img {
42.25 margin: 0; padding: 0.2em; }
42.26
42.27 +#funnel.compartment { padding: 0 0; }
42.28
42.29
42.30
42.31 @@ -119,6 +120,8 @@
42.32 #net > .compartment > iframe, #net > .compartment img { }
42.33 #ama > .compartment > iframe, #ama > .compartment img { }
42.34
42.35 +#starboard, #port, #flag, #aft, #prow, #bow, #foremast, #deck { display: none; }
42.36 +
42.37
42.38 /*
42.39 body { text-align: center; font-family: Arial, Sans; font-size: 9pt; }