Author: vjrj Date: 2009-04-22 03:29:14 +0200 (Wed, 22 Apr 2009) New Revision: 1098 Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/resources/kune.properties Log: Complete - task Flash content and z-index problem Incomplete - task Audio contents player Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 00:41:57 UTC (rev 1097) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 01:29:14 UTC (rev 1098) @@ -58,7 +58,8 @@ } public boolean isFlv() { - return type != null && subtype != null && type.equals("video") && subtype.equals("flv"); + return type != null && subtype != null && type.equals("video") + && (subtype.equals("flv") || subtype.equals("x-flv")); } /** Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-22 00:41:57 UTC (rev 1097) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-22 01:29:14 UTC (rev 1098) @@ -75,8 +75,10 @@ } private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { - Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString()), new UrlParam( - FileConstants.DOWNLOAD, download)); + Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())); + if (download) { + url.add(new UrlParam(FileConstants.DOWNLOAD, download)); + } if (useHash) { url.add(new UrlParam(FileConstants.HASH, session.getUserHash())); } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-22 00:41:57 UTC (rev 1097) +++ trunk/src/main/resources/kune.properties 2009-04-22 01:29:14 UTC (rev 1098) @@ -52,5 +52,5 @@ ### Media options # The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_FLV_URL### tag) -kune.media.embededobject = <object width="300" height="200" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.embededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object>