josch/yolanda
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

The device has been modified: Your browser does not support Ogg Theora

Browse source 
video playback.


git-svn-id: http://yolanda.mister-muffin.de/svn@250 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-03-08 19:40:02 +00:00
parent 3de6765d56
commit b5714105bf
9 changed files with 126 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/images/flash-sucks.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8 KiB

BIN
trunk/images/mplayer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 11 KiB

8
trunk/images/tango/README
View file

@ -1,5 +1,5 @@
Tango icons taken from Tango icons by various Artists
http://tango.freedesktop.org/Tango_Icon_Gallery License: Creative Commons BY-SA 2.5
they are licensed under CC BY-SA 2.5 Totem icon by Jakub "jimmac" Steiner
http://creativecommons.org/licenses/by-sa/2.5/ License: GPL 2.0

BIN
trunk/images/totem.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

1
trunk/locale/en-us.xml
View file

@ -61,6 +61,7 @@
<string id="error_insert_password">Please insert a password.</string> <string id="error_insert_password">Please insert a password.</string>
<string id="error_repeat_password">Please repeat your 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_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=""></string> <string id=""></string>
<!-- information --> <!-- information -->

36
trunk/style/default.css
View file

@ -5,12 +5,6 @@ Yolanda default stylesheet
/* global default */ /* global default */
*
{
clear: both;
}
body body
{ {
font-family: sans-serif; font-family: sans-serif;
@ -77,6 +71,12 @@ a
height: 3em; height: 3em;
} }
div.footer,
div.header
{
clear: both;
}
a.footer, a.footer,
a.header a.header
{ {
@ -137,15 +137,6 @@ a
border-width: 1px; border-width: 1px;
} }
/*
div.footer
{
position: absolute;
bottom: 1.5em;
margin-right: 1.5em;
}
*/
img.logo-header img.logo-header
{ {
display: none; display: none;
@ -158,7 +149,6 @@ a
/* content */ /* content */
div.button-download, div.button-download,
div.button-edit, div.button-edit,
div.button-junk div.button-junk
@ -185,6 +175,20 @@ a
vertical-align: middle; vertical-align: middle;
} }
div#container
{
position: relative;
}
div#container form
{
position: absolute;
top: 50%;
padding-left: auto;
padding-right: auto;
width: 100%
}
div.commentform, div.commentform,
div.loginform, div.loginform,
div.registerform, div.registerform,

32
trunk/xsl/xhtml.xsl
View file

@ -110,36 +110,4 @@
</xsl:template> </xsl:template>
<xsl:template name="tagcloud">
<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">
<xsl:for-each select="//tagcloud/tag">
<xsl:sort select="text" order="ascending" data-type="text" />
<a class="tag">
<xsl:attribute name="style">
<!--
scale *should* be logarihmic, but that's not widely supportet
-->
font-size:<xsl:value-of select="round((32-12)*(number(count)-number($min))div (number($max)-number($min)))+12" />px
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_results']" />
tag:
<xsl:value-of select="text" />
</xsl:attribute>
<xsl:value-of select="text" />
<!--
unnecessary, except for debug purposes
(<xsl:value-of select="count" />)
-->
</a>
&#8204;
</xsl:for-each>
</div>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

31
trunk/xsl/xhtml/frontpage.xsl
View file

@ -64,4 +64,35 @@
</xsl:template> </xsl:template>
<xsl:template name="tagcloud">
<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">
<xsl:for-each select="//tagcloud/tag">
<xsl:sort select="text" order="ascending" data-type="text" />
<a class="tag">
<xsl:attribute name="style">
<!--
scale *should* be logarihmic, but that's not widely supportet
-->
font-size:<xsl:value-of select="round((32-12)*(number(count)-number($min))div (number($max)-number($min)))+12" />px
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_results']" />
tag:
<xsl:value-of select="text" />
</xsl:attribute>
<xsl:value-of select="text" />
<!--
unnecessary, except for debug purposes
(<xsl:value-of select="count" />)
-->
</a>
&#8204;
</xsl:for-each>
</div>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

128
trunk/xsl/xhtml/video.xsl
View file

@ -41,15 +41,13 @@
function hide_movie() function hide_movie()
{ {
document.getElementById('video').style.display = 'none'; document.getElementById('video').style.display = 'none';
document.getElementById('thumbnail').style.display = 'block'; document.getElementById('container').style.display = 'block';
document.getElementById('buttons').style.display = 'block';
} }
function show_movie() function show_movie()
{ {
document.getElementById('video').style.display = 'block'; document.getElementById('video').style.display = 'inline';
document.getElementById('thumbnail').style.display = 'none'; document.getElementById('container').style.display = 'none';
document.getElementById('buttons').style.display = 'none';
} }
]]]]></xsl:text> ]]]]></xsl:text>
@ -57,6 +55,7 @@
</script> </script>
<object type="application/ogg" id="video"> <object type="application/ogg" id="video">
<xsl:attribute name="width"> <xsl:attribute name="width">
<xsl:value-of select="//video/@width" /> <xsl:value-of select="//video/@width" />
</xsl:attribute> </xsl:attribute>
@ -66,62 +65,75 @@
<xsl:attribute name="data"> <xsl:attribute name="data">
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'view=true')" /> <xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'view=true')" />
</xsl:attribute> </xsl:attribute>
<img src="/images/flash-sucks.png"/><br />
<img src="/images/vlc.png"/> <div class="messagebox" id="error">
<img src="/images/mplayer.png"/> <img src="/images/tango/dialog-error.png" />
<xsl:value-of select="$locale_strings[@id='error_no_ogg_plugin']" />
</div>
<div>
<img src="/images/vlc.png"/>
<img src="/images/mplayer.png"/>
<img src="/images/totem.png"/>
</div>
</object> </object>
<img id="thumbnail" style="display: none;"> <div id="container" style="display: none;">
<xsl:attribute name="src">
<xsl:value-of select="//video/@thumbnail" />
</xsl:attribute>
<xsl:attribute name="alt">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
</xsl:attribute>
<xsl:attribute name="height">
<xsl:value-of select="//video/@height" />
</xsl:attribute>
<xsl:attribute name="widht">
<xsl:value-of select="//video/@width" />
</xsl:attribute>
</img>
<form id="buttons" method="get"> <img>
<xsl:attribute name="action"> <xsl:attribute name="src">
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" /> <xsl:value-of select="//video/@thumbnail" />
</xsl:attribute> </xsl:attribute>
<button <xsl:attribute name="alt">
name="playback" <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
type="button" </xsl:attribute>
value="playback" <xsl:attribute name="height">
onclick="show_movie()"> <xsl:value-of select="//video/@height" />
<img src="/images/tango/media-playback-start.png" alt="playback" /> </xsl:attribute>
<br /> <xsl:attribute name="width">
<xsl:value-of select="$locale_strings[@id='video_playback']" /> <xsl:value-of select="//video/@width" />
<br /> </xsl:attribute>
<xsl:variable name="hours" select="floor(//video/@duration div 3600)" /> </img>
<xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" /> <form>
<xsl:choose> <xsl:attribute name="action">
<xsl:when test="$hours=0"> <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
(<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />) </xsl:attribute>
</xsl:when> <button
<xsl:otherwise> name="playback"
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />) type="button"
</xsl:otherwise> value="playback"
</xsl:choose> onclick="show_movie()">
</button> <img src="/images/tango/media-playback-start.png" alt="playback" />
<button <br />
name="download" <xsl:value-of select="$locale_strings[@id='video_playback']" />
type="submit" <br />
value="download"> <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
<img src="/images/tango/document-save.png" alt="download" /> <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
<br /> <xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
<xsl:value-of select="$locale_strings[@id='video_download']" /> <xsl:choose>
<br /> <xsl:when test="$hours=0">
(<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />) (<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</button> </xsl:when>
</form> <xsl:otherwise>
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:otherwise>
</xsl:choose>
</button>
<button
name="download"
type="submit"
value="download">
<img src="/images/tango/document-save.png" alt="download" />
<br />
<xsl:value-of select="$locale_strings[@id='video_download']" />
<br />
(<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />)
</button>
</form>
</div>
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">