#1738

diff --git a/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php b/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
index d9da8fe5f69a4817c621c8f2ae7b382756c0447f..5dc5dc8f2556c85a7e6937ac4319d6c3adc9c194 100644 (file)
--- a/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
@@ -1411,8 +1411,7 @@ class wsHTML5Compiler {
                        // Less files must be copied to temporary directory so they'll
                        // have access to the variables generated in book-variables.less
                        copy($source_less, $destination_less);
-                       $less = new CubeIT_CommandLine('lessc');
-                       $less->setArg('plugin', 'less-plugin-clean-css');
+                       $less = new CubeIT_CommandLine('/usr/local/bin/lessc');
                        $less->setArg(null, $destination_less);
                        $less->setArg(null, $destination_css);
                        $less->execute();

diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
index 6a39d6cf1f13f4aa3956f6ebb0f21e9ccc13da2f..a5d54f7844bd8b995c1f53a20785d2cc32a6690d 100644 (file)
--- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
@@ -1404,8 +1404,7 @@ class wsHTML5Compiler {
                        // Less files must be copied to temporary directory so they'll
                        // have access to the variables generated in book-variables.less
                        copy($source_less, $destination_less);
-                       $less = new CubeIT_CommandLine('lessc');
-                       $less->setArg('plugin', 'less-plugin-clean-css');
+                       $less = new CubeIT_CommandLine('/usr/local/bin/lessc');
                        $less->setArg(null, $destination_less);
                        $less->setArg(null, $destination_css);
                        $less->execute();

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index e8d8123a3686f4229f0ea00e0d465a72820727f4..3539b6b3de302f58291b86fad71fb2960dd2677c 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -951,10 +951,8 @@ class wsHTML5Compiler {
                                $tmp = cubeFiles::tempnam();
                                file_put_contents($tmp, $js);
 
-                               $uglify = new CubeIT_CommandLine('uglifyjs');
-                               $uglify->setPath(CONVERTER_PATH);
+                               $uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');
                                $uglify->setArg('o', $minimized);
-                               $uglify->setArg('no-copyright');
                                $uglify->setArg(null, $tmp);
                                $uglify->execute();
                                $uglify->debug();
@@ -1496,11 +1494,12 @@ class wsHTML5Compiler {
                        // Less files must be copied to temporary directory so they'll
                        // have access to the variables generated in book-variables.less
                        copy($source_less, $destination_less);
-                       $less = new CubeIT_CommandLine('lessc');
-                       $less->setArg('plugin', 'less-plugin-clean-css');
+                       $less = new CubeIT_CommandLine('/usr/local/bin/lessc');
+                       //$less->setArg('clean-css', '--s1 --advanced --compatibility=ie10');
                        $less->setArg(null, $destination_less);
                        $less->setArg(null, $this->vdir . '/' . $destination_css);
                        $less->execute();
+                       $less->debug();
                        if (!file_exists($this->vdir . '/' . $destination_css)) {
                                die($less->output);
                        }

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 5ad7c36dde355d35d787fef4d9befbeb6a3e964c..e919b7476d469fb09b2aa3073e9fd97da3ddeda3 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -528,8 +528,8 @@ class videoLink extends wsHTML5Link {
                $h = round($this->height * $this->getCssScale());
 
                // Note: width and height for the video is normally measured from the
-        // preview frame for local files or set to 1280 x 720 for web videos.
-        // The $w and $h variables here seem to be null generally...
+               // preview frame for local files or set to 1280 x 720 for web videos.
+               // The $w and $h variables here seem to be null generally...
 
                return $this->makeVideoTag($this, $w, $h, $this->compiler);
        }
@@ -567,7 +567,7 @@ class videoLink extends wsHTML5Link {
                        $attr['height'] = $h;
 
                } else if (!is_null($compiler)) {
-            // Get video dimensions from thumbnail if possible (locally uploaded files)
+                       // Get video dimensions from thumbnail if possible (locally uploaded files)
                        $path = WS_BOOKS . '/working/' . $compiler->book_id . '/' . $basename . '.jpg';
                        $dim = getimagesize($path);
                        $attr['width'] = $dim[0];
@@ -750,7 +750,8 @@ class actionLink extends internalLink {
                if (in_array($this->to, $this->_share)) {
                        return parent::getAdditionnalContent() . ' data-service="' . $this->to . '" ';
                } else {
-                       return parent::getClasses() . ' data-action="' . $this->to . '" ';
+                       return /*parent::getClasses()*/
+                               ' data-action="' . $this->to . '" ';
                }
        }
 

diff --git a/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php b/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
index 3605ee5afa3265305078d2b0bbab371fbaf69509..a535b637443a68e23d0c9eb7f8acbcb8569423af 100644 (file)
--- a/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
@@ -1504,8 +1504,7 @@ class wsHTML5Compiler {
                        // Less files must be copied to temporary directory so they'll
                        // have access to the variables generated in book-variables.less
                        copy($source_less, $destination_less);
-                       $less = new CubeIT_CommandLine('lessc');
-                       $less->setArg('plugin', 'less-plugin-clean-css');
+                       $less = new CubeIT_CommandLine('/usr/local/bin/lessc');
                        $less->setArg(null, $destination_less);
                        $less->setArg(null, $this->vdir . '/' . $destination_css);
                        $less->execute();