WICKET-6490 * Fixing links
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/32a719d4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/32a719d4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/32a719d4 Branch: refs/heads/WICKET-6490 Commit: 32a719d4f0012b299125b0a87461f2585e0c4ceb Parents: ae9f7a1 Author: Tobias Soloschenko <[email protected]> Authored: Sat Nov 4 09:28:29 2017 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Sat Nov 4 15:11:19 2017 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/examples/WicketExampleHeader.html | 2 +- .../org/apache/wicket/examples/WicketExampleHeader.java | 11 ++++++++++- .../apache/wicket/examples/homepage/HomePageHeader.html | 2 +- .../apache/wicket/examples/homepage/HomePageHeader.java | 11 ++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/32a719d4/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 7286413..475303f 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="/"><img wicket:id="exampleheaderimage" href="#" alt="Apache Wicket"></a> + <a href="#" wicket:id="exampleheaderhomelink"><img wicket:id="exampleheaderimage" alt="Apache Wicket" /></a> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/wicket/blob/32a719d4/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 a57ee0e..ba09388 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,7 +18,10 @@ 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; /** @@ -44,6 +47,12 @@ public final class WicketExampleHeader extends Panel setRenderBodyOnly(true); - add(new Image("exampleheaderimage", new PackageResourceReference(ResourcesLocator.class, "logo-apachewicket-examples-white.svg"))); + 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); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/32a719d4/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html index 3d460ac..0735a3f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.html @@ -10,7 +10,7 @@ <nav class="mainmenu"> </nav> <div class="jumbotron-logo"> - <a href="/"><img wicket:id="headerimage" href="#" alt="Apache Wicket"></a> + <a wicket:id="headerhomelink"><img wicket:id="headerimage" alt="Apache Wicket"></a> </div> <div class="jumbotron-mission">Live examples to learn Apache Wicket!</div> <div class="jumbotron-download"> http://git-wip-us.apache.org/repos/asf/wicket/blob/32a719d4/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java index 0276a2b..e1094d8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageHeader.java @@ -4,7 +4,10 @@ import org.apache.wicket.Application; import org.apache.wicket.examples.resources.ResourcesLocator; import org.apache.wicket.markup.html.basic.Label; 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; public class HomePageHeader extends Panel { @@ -31,6 +34,12 @@ public class HomePageHeader extends Panel { return version; } })); - add(new Image("headerimage", new PackageResourceReference(ResourcesLocator.class, "logo-apachewicket-examples-white.svg"))); + + ExternalLink externalLink = new ExternalLink("headerhomelink", + Model.of(WebApplication.get().getServletContext().getContextPath())); + + externalLink.add(new Image("headerimage", new PackageResourceReference(ResourcesLocator.class, "logo-apachewicket-examples-white.svg"))); + + add(externalLink); } }
