You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/12/20 15:31:42 UTC
svn commit: r1051131 - in
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples:
WicketExamplePage.java resourcedecoration/HomePage.html
resourcedecoration/HomePage.java resourcedecoration/app.css
Author: mgrigorov
Date: Mon Dec 20 14:31:42 2010
New Revision: 1051131
URL: http://svn.apache.org/viewvc?rev=1051131&view=rev
Log:
Make resource decoration page extending WicketExamplePage
Now it looks like the other example pages
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/app.css
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java?rev=1051131&r1=1051130&r2=1051131&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java Mon Dec 20 14:31:42 2010
@@ -38,6 +38,8 @@ public class WicketExamplePage extends W
/**
* Constructor
+ *
+ * @param pageParameters
*/
public WicketExamplePage(final PageParameters pageParameters)
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html?rev=1051131&r1=1051130&r2=1051131&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html Mon Dec 20 14:31:42 2010
@@ -1,18 +1,24 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
<wicket:head>
<title>Resource Aggregation Example Application</title>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
</wicket:head>
<body>
- <h1 class="header">Resource Aggregation Example Application</h1>
- <p>If the body background is light grey, the app.css was loaded.</p>
- <p>If the h1 above has a dashed bottom border (and the one below has a dashed top border), header.css and footer.css were loaded.</p>
- <div wicket:id="jsProofPlaceholder" class="jsProofPlaceholder">
- placeholder that JS can do something with
- </div>
- <div wicket:id="ajaxProofPlaceholder" class="ajaxProofPlaceholder pending">
- after five seconds, you should see ajax update this container (to a green border)
- </div>
- <div class="complete">everything is done when all three boxes are green</div>
- <h1 class="footer">footer h1</h1>
+ <div wicket:id="mainNavigation"></div>
+
+ <div class="bodyContent">
+ <h1 class="header">Resource Aggregation Example Application</h1>
+ <p style="font-size: 1.5em">If the background is light grey, then app.css was loaded.</p>
+ <p style="font-size: 1.5em">If the h1 above has a dashed bottom border (and the one below has a dashed top border), header.css and footer.css were loaded.
+ They are merged at the server side and delivered together to the browser</p>
+ <div wicket:id="jsProofPlaceholder" class="jsProofPlaceholder">
+ placeholder that JS can do something with
+ </div>
+ <div wicket:id="ajaxProofPlaceholder" class="ajaxProofPlaceholder pending">
+ after five seconds, you should see ajax update this container (to a green border)
+ </div>
+ <div class="complete">Everything is done when all three boxes are green</div>
+ <h1 class="footer">footer h1</h1>
+ </div>
</body>
</html>
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java?rev=1051131&r1=1051130&r2=1051131&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java Mon Dec 20 14:31:42 2010
@@ -20,17 +20,17 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.resourcedecoration.GroupedAndOrderedResourceReference.ResourceGroup;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.time.Duration;
/***/
-public class HomePage extends WebPage implements IHeaderContributor
+public class HomePage extends WicketExamplePage
{
private static final long serialVersionUID = 1L;
@@ -41,6 +41,8 @@ public class HomePage extends WebPage im
*/
public HomePage(final PageParameters parameters)
{
+ super(parameters);
+
final WebMarkupContainer jsPlaceholder = new WebMarkupContainer("jsProofPlaceholder");
jsPlaceholder.add(new Behavior()
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/app.css
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/app.css?rev=1051131&r1=1051130&r2=1051131&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/app.css (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/app.css Mon Dec 20 14:31:42 2010
@@ -15,6 +15,6 @@
* limitations under the License.
*/
-body {
+.bodyContent {
background-color: #DEDEDE;
}
\ No newline at end of file