(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index cc2c0e57c4f9286a6ee78a9b3557c26caca57415..1ee292a27eb0138a49e80b020b67b84a8cc40aaf 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>\r
+    </open-files>\r
 </project-private>\r

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 89164d9c211b15905deff6cf27a938679d4128b5..db22c0fd28fd33ff465acb1cceabdde47ea1f98c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -88,8 +88,8 @@ class wsHTML5Link {
        public function getAdditionnalContent() {
                
        }
-       
-       public function getClasses(){
+
+       public function getClasses() {
                return array();
        }
 
@@ -129,7 +129,7 @@ class wsHTML5Link {
 class normalLink extends wsHTML5Link {
 
        public function getHTMLContent() {
-               $class =$this->getClasses();
+               $class = $this->getClasses();
                if ($this->display_area) {
                        $class[] = 'displayArea';
                }
@@ -246,9 +246,9 @@ class videoPopupLink extends normalLink {
 
                return '#/video/' . $basename;
        }
-       
+
        public function getAdditionnalContent() {
-               return ' data-video="'.rawurlencode(videoLink::makeVideoTag($this)).'" ';
+               return ' data-video="' . rawurlencode(videoLink::makeVideoTag($this)) . '" ';
        }
 
 }
@@ -319,7 +319,14 @@ class fileLink extends normalLink {
 class multimediaLink extends wsHTML5Link {
 
        public function getHTMLContent() {
-               return cubeMedia::flashObject(wsHTML5Link::getUniversalLocation($this->to), $this->width * $this->compiler->getCssScale(), $this->height * $this->compiler->getCssScale(), array(), '', '', 9, '#ffffff', '', 'true', 'noscale', 'transparent');
+               $this->copyExternalFile($this->to);
+               $w = $this->width * $this->compiler->getCssScale();
+               $h = $this->height * $this->compiler->getCssScale();
+               if ($this->alternative != '') {
+                       $this->copyExternalFile($this->alternative);
+               }
+               $alt = $this->alternative == '' ? '' : '<img src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
+               return cubeMedia::flashObject(wsHTML5Link::getUniversalLocation($this->to), $w, $h, array(), '', '', 9, '#ffffff', $alt, 'true', 'default', 'transparent');
        }
 
 }