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 2015/03/13 21:45:57 UTC
[41/50] wicket git commit: WICKET-5819 - Vertical layout for examples
WICKET-5819 - Vertical layout for examples
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d1cf3e3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d1cf3e3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d1cf3e3
Branch: refs/heads/pr-86-media_tags
Commit: 1d1cf3e3ed10df08cfaf7be235bde22dec0e3a73
Parents: 951655a
Author: klopfdreh <kl...@192.168.2.110>
Authored: Thu Feb 19 17:26:16 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Thu Mar 12 22:13:06 2015 +0100
----------------------------------------------------------------------
.../org/apache/wicket/examples/media/Home.css | 16 +++++
.../org/apache/wicket/examples/media/Home.html | 26 ++++++--
.../org/apache/wicket/examples/media/Home.java | 67 ++++++++++++--------
3 files changed, 76 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d1cf3e3/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.css
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.css b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.css
new file mode 100644
index 0000000..a4e5095
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.css
@@ -0,0 +1,16 @@
+video{
+ float:left;
+ height:240px;
+ width:320px;
+ margin-bottom:10px;
+ margin-right:10px;
+}
+.videoDescription{
+ float:left;
+ height:240px;
+ width:300px;
+ margin-bottom:10px;
+}
+.clearer{
+ clear:both;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d1cf3e3/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
index 8c77e49..7388a03 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
@@ -5,11 +5,25 @@
</head>
<body>
<div wicket:id="mainNavigation"></div>
- <video wicket:id="video1" ></video>
- <video wicket:id="video2" ></video>
- <video wicket:id="video3">
- <source wicket:id="source3"/>
- </video><br/><br/>
- For more video examples see comments in the java sources<br/><br/>The second movie is not displayed because of CORS settings - please read <a href="http://en.wikipedia.org/wiki/Cross-origin_resource_sharing">Cross-origin_resource_sharing - Wikipedia</a> for more information.
+ <h2>Below there are three types of videos to show the basic functionality of Wicket's media implementation</h2>
+ <h3>The implementation features full support of video / audio / source / track tags.</h3>
+ <div>
+ <!-- Video 1 -->
+ <video wicket:id="video1" ></video>
+ <div class="videoDescription"><b>Video1</b><br/>Demonstrate the basic set of methods to configure a video (setAutoplay(false); setControls(true); setLooping(false); setWidth(320); setHeight(240);) The width and height are null by default which means that the video is going to be rendered in size of the media file.</div>
+ <div class="clearer"></div>
+
+ <!-- Video 2 -->
+ <video wicket:id="video2" >
+ <source wicket:id="source2" />
+ </video>
+ <div class="videoDescription"><b>Video2</b><br/>This video is rendered with a source tag. You can add many source tags and apply a media query (setMedia(query);) so that based on the resolution different videos are going to be displayed.</div>
+ <div class="clearer"></div>
+
+ <!-- Video 3 -->
+ <video wicket:id="video3" ></video>
+ <div class="videoDescription"><b>Video3</b><br/>The last sample shows a remote video located here: http://media.w3.org/2010/05/video/movie_300.mp4. It can be added by set the url as String instead of adding a ResourceReference.</div>
+ <div class="clearer"></div>
+ </div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d1cf3e3/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java
index 558b126..03b1e8f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java
@@ -19,7 +19,8 @@ package org.apache.wicket.examples.media;
import java.util.UUID;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.media.MediaComponent.Cors;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.media.MediaStreamingResourceReference;
import org.apache.wicket.markup.html.media.Source;
import org.apache.wicket.markup.html.media.video.Video;
@@ -40,6 +41,8 @@ import org.apache.wicket.request.resource.PackageResourceReference;
public final class Home extends WicketExamplePage
{
+ private static final long serialVersionUID = 1L;
+
/**
* Constructor
*/
@@ -57,47 +60,57 @@ public final class Home extends WicketExamplePage
video1.setPoster(new PackageResourceReference(Home.class, "novideo.gif"));
add(video1);
- // External video
- PageParameters pageParameters = new PageParameters();
- pageParameters.add("random", UUID.randomUUID().toString());
- pageParameters.add("test", "test");
- Video video2 = new Video("video2", "http://media.w3.org/2010/05/video/movie_300.mp4",
- pageParameters);
- video2.setCrossOrigin(Cors.ANONYMOUS);
- add(video2);
-
// video with source
- Video video3 = new Video("video3");
- video3.setPoster(new PackageResourceReference(Home.class, "novideo.gif"));
+ Video video2 = new Video("video2");
+ video2.setPoster(new PackageResourceReference(Home.class, "novideo.gif"));
- Source source3 = new Source("source3", new MediaStreamingResourceReference(Home.class,
+ Source source2 = new Source("source2", new MediaStreamingResourceReference(Home.class,
"video.mp4"));
// Need to be set to true to show the type
- source3.setDisplayType(true);
+ source2.setDisplayType(true);
// the default type is the mime type of the image with no codec information
- source3.setType("video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"");
- video3.add(source3);
+ source2.setType("video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"");
+ video2.add(source2);
- add(video3);
+ add(video2);
- // video with track
+ // External video
+ PageParameters pageParameters = new PageParameters();
+ pageParameters.add("random", UUID.randomUUID().toString());
+ pageParameters.add("test", "test");
+ Video video3 = new Video("video3", "http://media.w3.org/2010/05/video/movie_300.mp4",
+ pageParameters);
+ video3.setPoster(new PackageResourceReference(Home.class, "novideo.gif"));
+ add(video3);
/*
- * Video video4 = new Video("video4", new MediaStreamingResourceReference(Home.class,
- * "dummyVideo.m4a"));
+ * // video with track
+ * Video video4 = new Video("video4", new MediaStreamingResourceReference(Home.class, "dummyVideo.m4a"));
*
- * // source tag Source source4 = new Source("source4",
- * "http://www.mytestpage.xc/video.m4a");
- * source4.setMedia("screen and (device-width:500px)"); source4.setType("video/mp4");
+ * // source tag
+ * Source source4 = new Source("source4", "http://www.mytestpage.xc/video.m4a");
+ * source4.setMedia("screen and (device-width:500px)");
+ * source4.setType("video/mp4");
* source4.setDisplayType(true); video4.add(source4);
*
- * // tack tag Track track4 = new Track("track4", new PackageResourceReference(Home.class,
- * "dummySubtitles.vtt")); track4.setKind(Kind.subtitles);
- * track4.setLabel("Subtitles of video"); track4.setSrclang(Locale.GERMANY);
- * track4.setDefaultTrack(true); video4.add(track4);
+ * // tack tag
+ * Track track4 = new Track("track4", new PackageResourceReference(Home.class, "dummySubtitles.vtt"));
+ * track4.setKind(Kind.subtitles);
+ * track4.setLabel("Subtitles of video");
+ * track4.setSrclang(Locale.GERMANY);
+ * track4.setDefaultTrack(true);
+ * video4.add(track4);
*
* add(video4);
*/
}
+
+ @Override
+ public void renderHead(IHeaderResponse response)
+ {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new PackageResourceReference(Home.class,
+ "Home.css")));
+ }
}