diff --git a/trunk/functions.pl b/trunk/functions.pl index 81c0087..801340a 100644 --- a/trunk/functions.pl +++ b/trunk/functions.pl @@ -186,7 +186,8 @@ sub output_page #send everything including http headers to the user - if xslt chosen is xspf set download filename return $session->header( - -type=>'text/xml', + -type=>'application/xhtml+xml', + # fix the MIME type so that every XSLT works again -charset=>'UTF-8', -cookie=>@cookies ), diff --git a/trunk/images/agplv3-155x51.png b/trunk/images/agplv3-155x51.png new file mode 100644 index 0000000..85a4add Binary files /dev/null and b/trunk/images/agplv3-155x51.png differ diff --git a/trunk/style/default.css b/trunk/style/default.css index 6e1c867..8272e53 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -137,12 +137,15 @@ a border-width: 1px; } +/* div.footer { position: absolute; bottom: 1.5em; margin-right: 1.5em; } +*/ + img.logo-header { display: none; diff --git a/trunk/tools/daemon.pl b/trunk/tools/daemon.pl index 8737ea0..496d4b0 100755 --- a/trunk/tools/daemon.pl +++ b/trunk/tools/daemon.pl @@ -178,7 +178,7 @@ while(1) $vwidth = int($vheight*($width/$height)/8 + .5)*8; $abitrate = 64; - $vbitrate = int($filesize*8) / $duration + .5) - $abitrate; + $vbitrate = int(($filesize*8) / $duration + .5) - $abitrate; #TODO: add metadata information system "ffmpeg2theora --optimize --videobitrate $vbitrate --audiobitrate $abitrate --sharpness 0 --width $vwidth --height $vheight --output $root/videos/$id /tmp/$id"; @@ -208,7 +208,7 @@ while(1) } else { - TODO: maybe make this event-driven by using the kernels has-this-file-changed-interface ? + #TODO: maybe make this event-driven by using the kernels has-this-file-changed-interface ? sleep 10; } } diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 90be52d..79b2f1b 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -17,14 +17,15 @@ omit-xml-declaration="no" /> + + + + - - - @@ -51,11 +52,16 @@ + + + + + - + @@ -63,7 +69,7 @@ - + +
@@ -208,7 +208,9 @@ + @@ -293,7 +295,7 @@ - +