bittorrent icon (license unclear), embedded mode has only play button

now, fixed tagcloud, buttons are now 164px instead of 15em (relative 
measurements are only appropriate with vector graphics)


git-svn-id: http://yolanda.mister-muffin.de/svn@350 7eef14d0-6ed0-489d-bf55-20463b2d70db

trunk/lang/en.xml

@@ -42,6 +42,7 @@
     <string id="fieldset_preview">Preview</string>
     <string id="fieldset_results">Results</string>
     <string id="fieldset_search">Search</string>
+    <string id="fieldset_tagcloud">Tagcloud</string>
     <string id="fieldset_upload">Upload form</string>
     <string id="fieldset_video">Video</string>
 
@@ -72,14 +73,14 @@
     <string id="error_missing_DC.Rights">You did not supply a rights holder.</string>
     <string id="error_already_registered">You seem to be already registered. Please log out to create a new account.</string>
     <string id="error_already_logged_in">You seem to be already logged in. Please log out to log in again.</string>
-    <string id="error_username_password_do_not_match">Username and password do not match.</string>
+    <string id="error_username_password_do_not_match">Username and / or password do not match.</string>
     <string id="error_passwords_do_not_match">Passwords do not match.</string>
     <string id="error_username_already_registered">Your desired Username was already registered</string>
     <string id="error_insert_username">Please insert a username.</string>
     <string id="error_insert_password">Please insert a password.</string>
     <string id="error_repeat_password">Please repeat your password.</string>
     <string id="error_no_query">You passed no query string.</string>
-    <string id="error_no_ogg_plugin">Your browser does not support Ogg Theora video playback.</string>
+    <string id="error_no_ogg_plugin">Your browser does not support <xhtml:em>Ogg Theora</xhtml:em> video playback.</string>
     <string id="error_no_video">There is no video matching your request</string>
     <string id="error_openid_no_identity_server">The provided URL doesn't declare its OpenID identity server</string>
     <string id="error_openid_empty_url">No URL entered</string>
@@ -198,8 +199,8 @@
     </string>
 
     <!-- languages -->
-    <string id="language_en-us">English</string>
+    <string id="language_en">English</string>
-    <string id="language_de-de">German</string>
+    <string id="language_de">German</string>
 
     <!-- video page -->
     <string id="video_download">Download</string>
@@ -212,60 +213,18 @@
     <string id="comment_post">Post</string>
 
     <string id="video_plugin_help">
-        <xhtml:h1>Common Questions</xhtml:h1>
+        <p>
-
+            To view this video, install
-         <xhtml:h2>Why Not Use Flash ?</xhtml:h2>
+            <a href="http://www.videolan.org/vlc/">VLC</a>,
-            <xhtml:p>
+            <a href="http://www.mplayerhq.hu/design7/dload.html">mplayer</a> or
-                Many video sharing sites use the <xhtml:a href="http://www.adobe.com/de/products/flashplayer/"><xhtml:em>Adobe Flash Plugin</xhtml:em></xhtml:a> to play embedded video.
+            <a href="http://wiki.xiph.org/index.php/TheoraSoftwarePlayers">another player</a> capable of playing
-                We disapprove of that because <xhtml:em>Flash</xhtml:em> is <xhtml:em>proprietary</xhtml:em> (not <xhtml:a href="http://www.gnu.org/philosophy/free-sw.html"><xhtml:em>free software</xhtml:em></xhtml:a>).
+            <a href="http://theora.org/faq/#what">Ogg Theora</a>
-            </xhtml:p>
+            videos.
-            <xhtml:p>
+        </p>
-                Additionally, well-known video formats like <a href="http://en.wikipedia.org/wiki/Divx"><em>DivX</em></a> or <a href="http://en.wikipedia.org/wiki/H264"><em>H.264</em></a> are <a href="http://en.wikipedia.org/wiki/H264#Patent_licensing">patent-encumbered</a> in many countries.
+        <p>
-                Because license fees have to be paid for usage, it might be a legal risk to include them in free software:
+            For installation instructions, see the <a href="http://en.wikipedia.org/wiki/Wikipedia:Media_help_(Ogg)">Wikipedia Media Help</a>.
-                <a href="http://www.gnu.org/"><em>GNU</em></a>/<a href="http://kernel.org/"><em>Linux</em></a> distributions like <a href="http://www.debian.org/"><em>Debian</em></a> or <a href="http://www.ubuntu.com/"><em>Ubuntu</em></a> do not include them in their default installation.
+        </p>
-            </xhtml:p>
+    </string>
-            <xhtml:p>
-                Therefore, Yolanda uses the <a href="http://en.wikipedia.org/wiki/Ogg"><em>Ogg</em></a> container format containing the codecs <a href="http://www.theora.org/"><em>Theora</em></a> and <a href="http://www.vorbis.com/"><em>Vorbis</em></a>, which are maintained by <a href="http://www.xiph.org/"><em>Xiph.org</em></a>.
-                As of 2008, <em>Ogg</em> and <em>Vorbis</em> are free of patent claims and all known patents regarding <em>Theora</em> have been donated to the public.
-            </xhtml:p>
-
-            <h2>Which Plugins Do I Have to Download ?</h2>
-            <p>
-            Each media player plugin that can play <em>Ogg Theora + Vorbis</em> can be used.
-            While there are several plugins that qualify, this section will only focus on three of them, that are also <em>free software</em>.
-            </p>
-
-            <h3>VLC Media Player</h3>
-            <p>
-                <img class="icon-mediaplayer" src="/images/vlc.png"/>
-                The <em>VLC Media Player</em>, started by students of <em>École Centrale Paris</em> plays almost any video format on a wide range of platforms.
-                Be sure to install the <em>Mozilla</em> plugin or you will die a horrible, agonizing death.
-            </p>
-            <p>
-                Downloads can be found on the <a href="http://www.videolan.org/vlc/">Videolan web page</a>.
-                Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
-            </p>
-
-            <h3>Mplayer</h3>
-            <p>
-                <img class="icon-mediaplayer" src="/images/mplayer.png"/>
-                <em>Mplayer</em>, the media player for <em>EXPERT PROGRAMMERS</em>, is only available for <em>real</em> operating systems.
-                It does work with both <em>Mozilla</em> and <em>Konqueror</em>.
-            </p>
-            <p>
-                Downloads can be found on the <a href="http://www.mplayerhq.hu/design7/dload.html">Mplayer web page</a>.
-                Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
-            </p>
-
-            <h3>Totem</h3>
-            <p>
-                <img class="icon-mediaplayer" src="/images/totem.png"/>
-                <em>Totem</em> is the default media player in <a href="http://www.gnome.org/"><em>GNOME</em></a> and therefore only used by <em>SPIDER EXPERTS</em> like <em>Miguel de Icaza</em>.
-            </p>
-            <p>
-                Downloads can and should not be found, go ask <em>Miguel</em> for the <em>OOXML</em> specification instead.
-            </p>
-        </string>
 
     <!-- embedded video page-->
     <string id="backlink">backlink</string>

trunk/style/decoration/bridget.css

@@ -1,253 +0,0 @@
-/*
-Yolanda default stylesheet colors (using tango color palette)
-(c) 2007-2008 Nils Dagsson Moskopp
-
-This file is licensed under the WTF Public License
-(License terms: Do what the fuck you want.)
-
-Purpose of this file is to provide decorations, such as:
-    - borders (size, width, style etc.)
-    - font properties (family, size, style, weight etc.)
-    - spacing between elements and / or content (margin, padding)
-    - css pseudo-content that isn't graphics (:before, :after)
-*/
-
-div
-{
-    border-style:       solid;
-    border-width:       1px;
-    margin:             0.5em;
-    padding:            1em;
-}
-
-    div.description
-    {
-        /* TODO: find out /why we do this/ (see div.searchbar) ! */
-        margin-top:         0em;
-        text-align:         justify;
-    }
-
-    div.footer,
-    div.header
-    {
-    }
-
-    div.cc-license
-    {
-        /* TODO: find out /why we do this/ (see div.searchbar) ! */
-        margin-top:         0em;
-        vertical-align:     top;
-    }
-
-        div.cc-license img
-        {
-            border-width:   0px;
-            margin:         0.5em;
-        }
-
-    div.cc-license-chooser
-    {
-    }
-
-        div.cc-license-chooser img
-        {
-            vertical-align: middle;
-        }
-
-    div.commentform,
-    div.loginform,
-    div.registerform,
-    div.settingsform,
-    div.uploadform
-    {
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em;
-    }
-
-    #loginbox
-    {
-        /* TODO: find out /why we do this/ (see div.searchbar) ! */
-        margin-top:         0em;
-        text-align:         justify;
-    }
-
-    div.messagebox
-    {
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em;
-    }
-
-        div.messagebox span.message
-        {
-            font-weight:        bold;
-            line-height:        1.5em;
-            margin-bottom:      1em;
-            margin-top:         1em;
-        }
-
-    div.metadata
-    {
-        /* TODO: find out /why we do this/ (see div.searchbar) ! */
-        margin-top:         0em;
-        line-height:        1.5em;
-        text-align:         justify;
-    }
-
-    div.page-number
-    {
-        font-size:      40px;
-        overflow:       visible;
-    }
-
-    div.protip-embed
-    {
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em;
-    }
-
-div#preview
-{
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em;
-}
-
-        div#preview img
-        {
-        }
-
-    div.results
-    {
-        border-width:       0px;
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em !important;
-        padding:            0px;
-    }
-
-        div.results div.result
-        {
-            border-width:       0px;
-            padding:            0em;
-        }
-
-            div.results div.result img
-            {
-                border-width:   1px;
-            }
-
-    #searchbar
-    {
-        /* TODO: find out /why we do this/ !
-        does float make zero top margin really necessary or is it a bug ?
-        latter seems unlikely because it works across browsers. */
-        margin-top:         0em;
-        text-align:         justify;
-    }
-
-    div.splashbox
-    {
-        /* correct spacing to avoid overlapping with float:right elements */
-        margin-right:       22em;
-        text-align:         justify;
-    }
-
-    div.tagcloud
-    {
-        /* TODO: find out /why we do this/ (see div.searchbar) ! */
-        margin-top:         0em;
-        text-align:         justify;
-    }
-
-    div.video
-    {
-    }
-
-h1
-{
-    font-weight:        normal;
-    font-size:          2em;
-    text-align:         center;
-}
-
-li
-{
-}
-
-    li#search_custom_one
-    {
-    }
-
-    li#search_custom_two
-    {
-    }
-
-    li#search_custom_three
-    {
-    }
-
-input,
-textarea
-{
-    text-align:         left;
-    vertical-align:     middle;
-}
-
-
-img
-{
-    border-width:       0px
-}
-
-    img#logo
-    {
-    }
-
-p
-{
-    margin:         0.5em;
-    padding:        0.5em;
-}
-
-span
-{
-}
-
-    span.duration:after
-    {
-        content:            ")";
-    }
-
-    span.duration:before
-    {
-        content:            "(";
-    }
-
-    span.instruction
-    {
-    }
-
-    span.protip
-    {
-        font-weight:bold;
-    }
-
-    span.protip:after
-    {
-        content:            " )";
-    }
-
-    span.protip:before
-    {
-        content:            "( ";
-    }
-
-table
-{
-    text-align:         justify;
-}
-
-    ul#account-actions,
-    ul#queries
-    {
-        font-size:          1.5em;
-        font-weight:        bold;
-    }

trunk/style/default.css

@@ -8,6 +8,7 @@ This file is licensed under the WTF Public License
 Purpose of this file is to import color, decoration and structure stylesheets.
 */
 
+@import "reset.css";
 @import "colors/tango.css";
 @import "structure/fake6.css";
 

trunk/style/embedded.css

@@ -29,20 +29,13 @@ button
     position:          absolute;
     top:                50%;
     left:               50%;
-    width:              15em;
+    width:              164px;
-    height:             15em;
+    height:             164px;
 }
 
     button[name="playback"]
     {
         /* crude center hack */
-        margin-left:    -15em;
+        margin-left:    -82px;
-        margin-top:     -7.5em;
+        margin-top:     -82px;
-    }
-
-    button[name="download"]
-    {
-        /* crude center hack */
-        margin-left:    0em;
-        margin-top:     -7.5em;
     }

trunk/style/reset.css

@@ -0,0 +1,72 @@
+/*
+Eric Meyers reset stylesheet, stolen from
+<http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/>
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td
+{
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: 100%;
+    font-family: inherit;
+    vertical-align: baseline;
+}
+
+/* remember to define focus styles! */
+:focus
+{
+    outline: 0;
+}
+
+body
+{
+    line-height: 1;
+    color: black;
+    background: white;
+}
+
+ol,
+ul
+{
+    list-style: none;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table
+{
+    border-collapse: separate;
+    border-spacing: 0;
+}
+
+caption,
+th,
+td
+{
+    text-align: left;
+    font-weight: normal;
+}
+
+blockquote,
+q
+{
+    quotes: "" "";
+}
+
+    blockquote:before,
+    blockquote:after,
+    q:before,
+    q:after
+    {
+        content: "";
+    }

trunk/style/structure/fake6.css

@@ -103,8 +103,8 @@ fieldset
 
     button[name="upload"]
     {
-        width:          15em;
+        width:          164px;
-        height:         15em;
+        height:         164px;
     }
 
     input[type="text"],
@@ -182,22 +182,29 @@ form ol
             position:          absolute;
             top:                50%;
             left:               50%;
-            width:              15em;
+            width:              164px;
-            height:             15em;
+            height:             164px;
         }
 
         #preview form button[name="playback"]
         {
             /* crude center hack */
-            margin-left:    -15em;
+            margin-left:    -246px;
-            margin-top:     -7.5em;
+            margin-top:     -82px;
         }
 
         #preview form button[name="download"]
         {
             /* crude center hack */
-            margin-left:    0em;
+            margin-left:    -82px;
-            margin-top:     -7.5em;
+            margin-top:     -82px;
+        }
+
+        #preview form button[name="bittorrent"]
+        {
+            /* crude center hack */
+            margin-left:    82px;
+            margin-top:     -82px;
         }
 
 /* images */

trunk/xsl/xhtml-embed.xsl

@@ -17,6 +17,8 @@
     omit-xml-declaration="no"
 />
 
+<xsl:include href="./xhtml/pluginhelp.xsl" />
+
 <xsl:variable name="lang">
     <xsl:choose>
         <xsl:when test="document(concat('../lang/', //@lang, '.xml'))">
@@ -107,21 +109,8 @@
         <xsl:attribute name="data">
             <xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'view=true')" />
         </xsl:attribute>
-
+ 
-        <fieldset class="messagebox" id="error">
+        <xsl:call-template name="pluginhelp" />
-            <span class="message">Your browser does not support <em>Ogg Theora</em> video playback.</span>
-        </fieldset>
-        <p>
-            To view this video, install
-            <a href="http://www.videolan.org/vlc/">VLC</a>,
-            <a href="http://www.mplayerhq.hu/design7/dload.html">mplayer</a> or
-            <a href="http://wiki.xiph.org/index.php/TheoraSoftwarePlayers">another player</a> capable of playing
-            <a href="http://theora.org/faq/#what">Ogg Theora</a>
-            videos.
-        </p>
-        <p>
-            For installation instructions, see the <a href="http://en.wikipedia.org/wiki/Wikipedia:Media_help_(Ogg)">Wikipedia Media Help</a>.
-        </p>
 
     </object>
 
@@ -160,19 +149,6 @@
                     </xsl:attribute>
                 </img>
             </button>
-            <button
-                name="download"
-                type="submit"
-            >
-                <xsl:attribute name="value">
-                    <xsl:value-of select="$lang_strings[@id='video_download']" />
-                </xsl:attribute>
-                <img src="/images/tango/128x128/actions/document-save.png">
-                    <xsl:attribute name="alt">
-                        <xsl:value-of select="$lang_strings[@id='video_download']" />
-                    </xsl:attribute>
-                </img>
-            </button>
         </form>
 
     </div>

trunk/xsl/xhtml.xsl

@@ -36,7 +36,6 @@
 <xsl:include href="./xhtml/settings.xsl" />
 <xsl:include href="./xhtml/splash.xsl" />
 <xsl:include href="./xhtml/searchbar.xsl" />
-<xsl:include href="./xhtml/tagbar.xsl" />
 <xsl:include href="./xhtml/tagcloud.xsl" />
 <xsl:include href="./xhtml/upload.xsl" />
 <xsl:include href="./xhtml/video.xsl" />

trunk/xsl/xhtml/messagebox.xsl

@@ -17,7 +17,7 @@
 
         <span class="message">
             <xsl:variable name="messagetext" select="/page/message/@text" />
-            <xsl:value-of select="$lang_strings[@id=$messagetext]" />
+            <xsl:copy-of select="$lang_strings[@id=$messagetext]/node()" />
 
             <xsl:choose>
 

trunk/xsl/xhtml/pluginhelp.xsl

@@ -9,6 +9,12 @@
 
 <xsl:template name="pluginhelp">
 
+    <fieldset class="messagebox" id="error">
+        <span class="message">
+            <xsl:copy-of select="$lang_strings[@id='error_no_ogg_plugin']/node()" />
+        </span>
+    </fieldset>
+
     <fieldset class="pluginhelp">
 
         <legend>

trunk/xsl/xhtml/splash.xsl

@@ -9,7 +9,7 @@
 
 <xsl:template name="splashbox">
 
-    <div class="splashbox">
+    <fieldset class="splashbox">
 
 <!--
     This is placeholder content,
@@ -19,7 +19,7 @@
         <h1>Welcome to the Yolanda Video CMS Demo Platform</h1>
 
 <p>Weit hinten, hinter den Wortbergen, fern der Länder Vokalien und Konsonantien leben die Blindtexte. Abgeschieden wohnen Sie in Buchstabhausen an der Küste des Semantik, eines großen Sprachozeans. Ein kleines Bächlein namens Duden fließt durch ihren Ort und versorgt sie mit den nötigen Regelialien. Es ist ein paradiesmatisches Land, in dem einem gebratene Satzteile in den Mund fliegen. Nicht einmal von der allmächtigen Interpunktion werden die Blindtexte beherrscht - ein geradezu unorthographisches Leben.Doch alles Gutzureden konnte es nicht überzeugen und so dauerte es nicht lange, bis ihm ein paar heimtückische Werbetexter auflauerten, es mit Longe und Parole betrunken machten und es dann in ihre Agentur schleppten, wo sie es für ihre Projekte wieder und wieder mißbrauchten. Und wenn es nicht umgeschrieben wurde, dann benutzen Sie es immernoch.</p>
<p>Unterwegs traf es eine Copy. Die Copy warnte das Blindtextchen, da, wo sie herkäme wäre sie zigmal umgeschrieben worden und alles, was von ihrem Ursprung noch übrig wäre, sei das Wort „und“ und das Blindtextchen solle umkehren und wieder in sein eigenes, sicheres Land zurückkehren.</p>
<p>Doch alles Gutzureden konnte es nicht überzeugen und so dauerte es nicht lange, bis ihm ein paar heimtückische Werbetexter auflauerten, es mit Longe und Parole betrunken machten und es dann in ihre Agentur schleppten, wo sie es für ihre Projekte wieder und wieder mißbrauchten. Und wenn es nicht umgeschrieben wurde, dann benutzen Sie es immernoch.</p>
-    </div>
+    </fieldset>
 
 </xsl:template>
 

trunk/xsl/xhtml/tagbar.xsl

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://web.resource.org/cc/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
->
-
-<xsl:template name="tagbar">
-</xsl:template>
-
-<!-- here be tags -->
-
-</xsl:stylesheet>

trunk/xsl/xhtml/tagcloud.xsl

@@ -11,7 +11,13 @@
 
     <xsl:variable name="max" select="//tagcloud/tag/count[not(//tagcloud/tag/count &gt; .)]" />
     <xsl:variable name="min" select="//tagcloud/tag/count[not(//tagcloud/tag/count &lt; .)]" />
-    <div class="tagcloud">
+
+    <fieldset id="tagcloud">
+
+    <legend>
+        <xsl:value-of select="$lang_strings[@id='fieldset_tagcloud']" />
+    </legend>
+
         <xsl:for-each select="//tagcloud/tag">
             <xsl:sort select="text" order="ascending" data-type="text" />
             <a class="tag">
@@ -33,7 +39,8 @@
             </a>
             &#8204;
         </xsl:for-each>
-    </div>
+
+    </fieldset>
 
 </xsl:template>
 

trunk/xsl/xhtml/video.xsl

@@ -48,10 +48,10 @@
 
     <xsl:call-template name="video-description" />
 
-    <xsl:call-template name="video-cclicense"/>
-
     <xsl:call-template name="video-metadata" />
 
+    <xsl:call-template name="video-cclicense"/>
+
     <xsl:call-template name="video-object" />
 
     <xsl:call-template name="video-protip-embed" />
@@ -215,19 +215,6 @@ filesize
 
         <h1>
             <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />&#160;
-            <span class="duration">
-                <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
-                <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
-                <xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
-                <xsl:choose>
-                    <xsl:when test="$hours=0">
-                        <xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />
-                    </xsl:otherwise>
-                </xsl:choose>
-            </span>
         </h1>
         <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
     </fieldset>
@@ -339,13 +326,6 @@ filesize
                 <xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'view=true')" />
             </xsl:attribute>
 
-            <fieldset class="messagebox" id="error">
-
-                <span class="message">
-                    <xsl:value-of select="$lang_strings[@id='error_no_ogg_plugin']" />
-                </span>
-            </fieldset>
-
             <xsl:call-template name="pluginhelp" />
 
         </object>
@@ -404,6 +384,20 @@ filesize
                     </xsl:attribute>
                 </img>
             </button>
+           <button
+                disabled="disabled"
+                name="bittorrent"
+                type="submit"
+            >
+                <xsl:attribute name="value">
+                    <xsl:value-of select="$lang_strings[@id='video_download']" />
+                </xsl:attribute>
+                <img src="/images/tango/128x128/apps/bittorrent.png">
+                    <xsl:attribute name="alt">
+                        <xsl:value-of select="$lang_strings[@id='video_download']" />
+                    </xsl:attribute>
+                </img>
+            </button>
         </form>
 
     </fieldset>
@@ -422,7 +416,7 @@ filesize
         <br />
         <code>
             &lt;object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'xslt=xhtml-embed')" />"
-                type="application/xml"
+                type="application/xhtml+xml"
                 width="<xsl:value-of select="//video/@width" />"
                 height="<xsl:value-of select="//video/@height + 16" />"
             /&gt;