You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/11/04 15:18:00 UTC
[38/38] wicket git commit: WICKET-6490 pr 242 and fixes to examples
WICKET-6490 pr 242 and fixes to examples
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/86c970cd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/86c970cd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/86c970cd
Branch: refs/heads/WICKET-6490
Commit: 86c970cd2e745d5a2f39c12ee9066288541c3299
Parents: 32a719d
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sat Nov 4 16:16:51 2017 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sat Nov 4 16:16:51 2017 +0100
----------------------------------------------------------------------
wicket-examples/pom.xml | 6 ++++++
.../apache/wicket/examples/WicketExampleHeader.html | 2 +-
.../apache/wicket/examples/WicketExampleHeader.java | 12 ++----------
.../org/apache/wicket/examples/WicketExamplePage.java | 5 -----
.../apache/wicket/examples/ajax/prototype/Index.html | 5 ++---
.../customresourceloading/CustomLoadedTemplate.html | 14 +++++++-------
.../org/apache/wicket/examples/events/BasePage.html | 2 +-
.../apache/wicket/examples/template/border/Page1.html | 2 +-
.../template/pageinheritance/TemplatePage.html | 3 ++-
9 files changed, 22 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 29e5908..8a1e2e4 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -208,6 +208,9 @@
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.mp4</include>
+ <include>**/*.svg</include>
+ <include>**/*.woff</include>
+ <include>**/*.ttf</include>
</includes>
</resource>
<resource>
@@ -226,6 +229,9 @@
<include>**/*.vm</include>
<include>**/*.tmpl</include>
<include>**/*.mp4</include>
+ <include>**/*.svg</include>
+ <include>**/*.woff</include>
+ <include>**/*.ttf</include>
</includes>
</resource>
</resources>
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
index 475303f..32c6b03 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
@@ -5,7 +5,7 @@
<div class="header default">
<div class="l-container">
<div class="logo">
- <a href="#" wicket:id="exampleheaderhomelink"><img wicket:id="exampleheaderimage" alt="Apache Wicket" /></a>
+ <a href="/" ><img wicket:id="exampleheaderimage" alt="Apache Wicket" /></a>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
index ba09388..f375b80 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
@@ -18,10 +18,7 @@ package org.apache.wicket.examples;
import org.apache.wicket.examples.resources.ResourcesLocator;
import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.PackageResourceReference;
/**
@@ -47,12 +44,7 @@ public final class WicketExampleHeader extends Panel
setRenderBodyOnly(true);
- ExternalLink externalLink = new ExternalLink("exampleheaderhomelink",
- Model.of(WebApplication.get().getServletContext().getContextPath()));
-
- externalLink.add(new Image("exampleheaderimage", new PackageResourceReference(
- ResourcesLocator.class, "logo-apachewicket-examples-white.svg")));
-
- add(externalLink);
+ add(new Image("exampleheaderimage", new PackageResourceReference(
+ ResourcesLocator.class, "logo-apachewicket-examples-white.svg")));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
index 6bffaa6..4f0caa8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
@@ -21,14 +21,12 @@ import org.apache.wicket.examples.source.SourcesPage;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.PopupSettings;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.util.string.Strings;
/**
* Base class for all example pages.
@@ -56,9 +54,6 @@ public class WicketExamplePage extends WebPage
{
super(pageParameters);
- final String packageName = getClass().getPackage().getName();
- add(new Label("mainNavigation", Strings.afterLast(packageName, '.')));
-
BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("sources",
SourcesPage.class, SourcesPage.generatePageParameters(this));
add(link);
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
index 9b7258e..f4e393f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
@@ -1,8 +1,7 @@
<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - Prototype.js / component render</title>
+<wicket:head>
<script type="text/javascript" src="prototype.js"></script>
-</head>
+</wicket:head>
<body>
<wicket:extend>
<p>Counting link using Ajax: <a href="#" wicket:id="link">Click me!</a></p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
index 256e7fb..8cb5874 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
@@ -16,16 +16,15 @@
</head>
<body>
- <div class="header default">
- <div class="l-container">
- <div class="logo">
- <a href="/"><img src="/img/logo-apachewicket-white.svg"
- alt="Apache Wicket"></a>
- </div>
- </div>
+ <div wicket:id="pageHeader">
</div>
<main>
<div class="l-container">
+ <div class="text-right">
+ <a wicket:id="sources" class="button">
+ Source code
+ </a>
+ </div>
<p>
This page was loaded by a component specific override. You can use that - with care - if you have
to implement custom loading strategies that are very local to the component. For instance, a custom
@@ -40,6 +39,7 @@
cache key. This functionality can be used to e.g. when you want to load templates from a database,
and you know that the actual templates can be different from request to request.
</p>
+ </div>
</main>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
index f2e37b1..ea6236f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
@@ -3,7 +3,7 @@
<title>Wicket Examples - Events</title>
</head>
<body>
-<span wicket:id="mainNavigation"
+<wicket:extend>
<a href="Index.html" wicket:id="back">[go back]</a><p/>
<wicket:child/>
</wicket:extend>
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
index 159c084..59fab6a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
@@ -7,7 +7,7 @@
<body>
<wicket:extend>
-
+ <h2 wicket:id="title"></h2>
<span wicket:id="border">
Lorem ipsum dolor sit amet, consectetuer
http://git-wip-us.apache.org/repos/asf/wicket/blob/86c970cd/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
index 199450d..d48bfa3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.html
@@ -5,7 +5,8 @@
</wicket:head>
<body>
<wicket:extend>
-
+ <h2 wicket:id="title"></h2>
+
<div id="header" class="borderedBlock">
<table width="100%">
<tr>