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/02 11:33:29 UTC
[25/26] wicket git commit: Layout fixes
Layout fixes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d7c100f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d7c100f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d7c100f
Branch: refs/heads/WICKET-6490
Commit: 1d7c100f881717ee6f58a1a909b52410c14321da
Parents: 9e4046c
Author: Andrea Del Bene <ad...@apache.org>
Authored: Wed Nov 1 20:59:48 2017 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Wed Nov 1 20:59:48 2017 +0100
----------------------------------------------------------------------
.../wicket/examples/WicketExamplePage.html | 2 +-
.../CustomLoadedTemplate.html | 31 +++++++++-----------
.../apache/wicket/examples/template/Index.html | 2 +-
.../template/border/TemplateBorder.html | 6 ++--
.../template/pageinheritance/TemplatePage.html | 6 ++--
5 files changed, 20 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d7c100f/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
index 196f417..5b403ae 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
@@ -32,7 +32,7 @@
Source code
</a>
</div>
- <div id="content">
+ <div>
<wicket:child/>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d7c100f/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 0364878..5d04acf 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
@@ -27,23 +27,20 @@
</div>
<main>
<div class="l-container">
- <div id="content">
- <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
- component that loads it's template from a database and for which you don't want the application
- to have to know about it's differing loading resource.
- </p>
- <p>
- This example loads the custom template just once, though it may reload when resource polling is
- turned on and the template changes. If you want a load the template every time a page (or panel)
- is requested, you can additionally let your container implement IMarkupCacheKeyProvider, and then
- return null in the implementation of getCacheKey; Wicket will not cache templates without a
- 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>
- </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
+ component that loads it's template from a database and for which you don't want the application
+ to have to know about it's differing loading resource.
+ </p>
+ <p>
+ This example loads the custom template just once, though it may reload when resource polling is
+ turned on and the template changes. If you want a load the template every time a page (or panel)
+ is requested, you can additionally let your container implement IMarkupCacheKeyProvider, and then
+ return null in the implementation of getCacheKey; Wicket will not cache templates without a
+ 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>
</main>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d7c100f/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
index 6113e4a..d980fe1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
@@ -9,7 +9,7 @@
<h1>Template example</h1>
- <p style="border: 2px dotted #fc0; width: 500px; padding: 5px;">
+ <p style="border: 2px dotted #fc0; padding: 5px;">
This example shows two different ways of building your page up from shared parts.
The first example uses what we commonly call 'markup inheritence',
and the second example shows how to achieve roughly the same
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d7c100f/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html
index 6a47dad..f1fde5d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.html
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<head>
- <title wicket:id="title">title comes here</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
+<wicket:head>
<link rel="stylesheet" type="text/css" href="template/style.css"/>
-</head>
+</wicket:head>
<body>
<wicket:border>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d7c100f/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 ce5ad2e..199450d 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
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<head>
- <title wicket:id="title">title comes here</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
+<wicket:head>
<link rel="stylesheet" type="text/css" href="template/style.css"/>
-</head>
+</wicket:head>
<body>
<wicket:extend>