You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/08/02 00:39:00 UTC
svn commit: r981336 -
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/
Author: knopp
Date: Sun Aug 1 22:38:59 2010
New Revision: 981336
URL: http://svn.apache.org/viewvc?rev=981336&view=rev
Log:
Remove the border
(caused problems with determining statelessness of page as it was taken out of component hierarchy)
Added:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html (with props)
Removed:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplicationBorder.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplicationBorder.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html
Added: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html?rev=981336&view=auto
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html (added)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html Sun Aug 1 22:38:59 2010
@@ -0,0 +1,20 @@
+<html xmlns:wicket="http://wicket.apache.org/">
+<head>
+ <title>Wicket Examples - library</title>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+</head>
+<body>
+
+ <span wicket:id="mainNavigation" />
+
+ <p>
+ <wicket:link><a href = "Home.html">Home</a></wicket:link>
+ <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
+ <br>
+ <div style="border:1px solid gray; overflow: hidden; padding: 1em;">
+ <wicket:child/>
+ </div>
+ </p>
+
+</body>
+</html>
\ No newline at end of file
Propchange: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java?rev=981336&r1=981335&r2=981336&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java Sun Aug 1 22:38:59 2010
@@ -16,10 +16,7 @@
*/
package org.apache.wicket.examples.library;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.border.Border;
/**
@@ -35,32 +32,14 @@ import org.apache.wicket.markup.html.bor
*/
public class AuthenticatedWebPage extends WicketExamplePage
{
- private final Border border;
+
/**
* Contruct
*/
public AuthenticatedWebPage()
{
- border = new LibraryApplicationBorder("border");
- }
- /**
- * @see org.apache.wicket.examples.WicketExamplePage#onInitialize()
- */
- @Override
- protected void onInitialize()
- {
- super.onInitialize();
-
- // Create border and add it to the page
- add(border);
-
- // The WicketExamplePage constructor already created and added it. We need to move it into
- // the border.
- Component mainNavigation = border.getFromBorderBody("mainNavigation");
-
- border.addToBorder(mainNavigation);
}
@@ -74,34 +53,4 @@ public class AuthenticatedWebPage extend
return (LibrarySession)getSession();
}
- /**
- * For all components which shall not be added to the border
- *
- * @param children
- * @return this.
- */
- protected MarkupContainer addToPage(Component... children)
- {
- return super.add(children);
- }
-
- /**
- * @see org.apache.wicket.MarkupContainer#add(org.apache.wicket.Component[])
- */
- @Override
- public MarkupContainer add(final Component... children)
- {
- for (Component child : children)
- {
- if ((border == null) || (child == border))
- {
- super.add(children);
- }
- else
- {
- border.addToBorderBody(child);
- }
- }
- return this;
- }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html?rev=981336&r1=981335&r2=981336&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.html Sun Aug 1 22:38:59 2010
@@ -1,8 +1,5 @@
-<html xmlns:wicket="http://wicket.apache.org/">
-<head>
- <title>Wicket Examples - library</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
+<wicket:extend>
+
<style type="text/css">
<!--
.italic {
@@ -10,9 +7,8 @@
}
-->
</style>
-<body>
- <span wicket:id = "border">
+
Book Details
<p>
<table>
@@ -65,8 +61,7 @@
</td>
</tr>
</table>
- <p>
+ <div style="margin-top: 1em">
<a wicket:id = "edit" href="EditBook.html">Edit</a>
- </span>
-</body>
-</html>
+ </div>
+</wicket:extend>
\ No newline at end of file
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html?rev=981336&r1=981335&r2=981336&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.html Sun Aug 1 22:38:59 2010
@@ -1,11 +1,4 @@
-<html xmlns:wicket="http://wicket.apache.org/">
-<head>
- <title>Wicket Examples - library</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
-<body>
-
- <span wicket:id = "border">
+<wicket:extend>
<span wicket:id = "feedback"/>
<p>
<form wicket:id = "editBookForm">
@@ -70,6 +63,5 @@
</tr>
</table>
</form>
- </span>
-</body>
-</html>
+ </p>
+</wicket:extend>
\ No newline at end of file
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java?rev=981336&r1=981335&r2=981336&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java Sun Aug 1 22:38:59 2010
@@ -146,7 +146,10 @@ public final class EditBook extends Auth
public final void onSubmit()
{
final Book book = getModelObject();
- setResponsePage(new BookDetails(book));
+ BookDetails details = new BookDetails(book);
+
+ setResponsePage(details);
+
// setRedirect(true);
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html?rev=981336&r1=981335&r2=981336&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html Sun Aug 1 22:38:59 2010
@@ -1,11 +1,4 @@
-<html xmlns:wicket="http://wicket.apache.org/">
-<head>
- <title>Wicket Examples - library</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
-<body>
-
- <span wicket:id = "border">
+<wicket:extend>
<table width = "100%">
<tr>
<th>Title</th>
@@ -40,9 +33,9 @@
</td>
</tr>
</table>
- <p>
+ <div style="margin-top: 1em">
<span wicket:id = "navigator"/>
- </p>
- </span>
-</body>
-</html>
+
+ </div>
+
+</wicket:extend>
\ No newline at end of file