wip #3358 @0.25

diff --git a/fluidbook/icones/15/interface.svg b/fluidbook/icones/15/interface.svg
index 214f35bfb6c3a19a6905444fcbb953446f298411..55bd8f84ffeb98c8afea839d4f5691d517fd9f14 100644 (file)
--- a/fluidbook/icones/15/interface.svg
+++ b/fluidbook/icones/15/interface.svg
@@ -185,6 +185,15 @@
        c0-0.6-0.3-1.2-1.1-1.2c-0.8,0-1.5,0.9-1.5,2c0,0.7,0.2,1.2,0.2,1.2s-0.8,3.5-1,4.2c-0.1,0.5-0.1,1.1-0.1,1.6\r
        c-2.7-1.2-4.6-3.9-4.6-7c0-4.2,3.4-7.7,7.7-7.7s7.7,3.4,7.7,7.7S16.7,20.2,12.5,20.2z"/>\r
     </symbol>\r
+    <symbol id="share-whatsapp" viewBox="0 0 25 25">\r
+        <path d="M12.7,3c-5.1,0-9.3,4.1-9.3,9.3c0,1.7,0.5,3.4,1.3,4.8l-1.7,5l5.1-1.6c1.3,0.7,2.9,1.2,4.5,1.2\r
+                       c5.1,0,9.3-4.1,9.3-9.3C21.9,7.1,17.8,3,12.7,3z M12.7,20c-1.6,0-3-0.5-4.2-1.3l-3,0.9l1-2.9C5.5,15.5,5,13.9,5,12.3\r
+                       C5,8,8.4,4.6,12.7,4.6c4.2,0,7.7,3.5,7.7,7.7C20.4,16.5,16.9,20,12.7,20z M17,14.4c-0.2-0.1-1.4-0.7-1.6-0.8\r
+                       c-0.2-0.1-0.4-0.1-0.5,0.1c-0.2,0.2-0.6,0.7-0.8,0.9c-0.1,0.2-0.3,0.2-0.5,0c-0.2-0.1-1-0.4-1.9-1.2c-0.7-0.7-1.1-1.4-1.3-1.7\r
+                       c-0.1-0.2,0-0.4,0.1-0.5c0.1-0.1,0.2-0.3,0.4-0.4c0.1-0.1,0.2-0.2,0.3-0.4s0.1-0.3,0-0.4c-0.1-0.1-0.5-1.3-0.7-1.8\r
+                       c-0.2-0.5-0.4-0.4-0.5-0.4c-0.1,0-0.3,0-0.5,0c-0.2,0-0.4,0-0.6,0.3C8.7,8.2,8.1,8.8,8,9.9c0,1.2,0.8,2.3,0.9,2.5\r
+                       c0.1,0.2,1.5,2.7,3.9,3.7c2.4,1,2.4,0.7,2.8,0.7c0.4,0,1.4-0.5,1.6-1.1c0.2-0.5,0.2-1,0.2-1.1C17.4,14.6,17.2,14.5,17,14.4z"/>\r
+    </symbol>\r
 \r
 \r
     <symbol id="extra-pin" viewBox="0 0 20 25">\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 84f5c3e232b12b551f679b603d2eec59ab3e86f8..af9d02a942ea4ef5ec3fb0100a242eded7ca8b16 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -130,6 +130,7 @@ class wsBookParametres extends wsParametres
         $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('E-mail'));
         $this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));
         $this->fields['twitter'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Twitter'));
+        $this->fields['whatsapp'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('WhatsApp'));
         $this->fields['linkedin'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('LinkedIn'));
         $this->fields['googleplus'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Google +'));
         $this->fields['viadeo'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Viadeo'));
@@ -140,7 +141,7 @@ class wsBookParametres extends wsParametres
         $this->forms['share'] = array('label' => __('Fonctions de partage'),
             'fieldsnames' => array('share', '|', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', 'sendasfluidbook', 'email_mailto', '|',
                 'facebook_title', 'facebook_description', 'facebook_image', 'twitter_description', '|',
-                'friend', 'facebook', 'twitter', 'googleplus', 'linkedin', 'viadeo', 'pinterest', '|', 'customSharer', '|', 'friendWidth', 'friendHeight'));
+                'friend', 'facebook', 'twitter', 'whatsapp', 'linkedin', 'pinterest', '|', 'googleplus', 'viadeo', '|', 'customSharer', '|', 'friendWidth', 'friendHeight'));
 //.
         $this->fields['seoVersion'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Générer une version pour les moteurs de recherche'));
         $this->fields['seoRobots'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Autoriser le parcours par les moteurs de recherche'));

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 4d7b880a6dbb8cfc01bb9947a03f1f40a7f130d5..ba4f73d8e9dfa6572e79142afe45d2c9ca536e5b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1557,7 +1557,7 @@ class wsHTML5Compiler
                     }
 
                     if (!file_exists($minimized) || filesize($minimized) == 0) {
-                        die('An error occured while uglifying ' . $hasNonMin . '? ' . $minimized . ': ' . ($uglify ?? $uglify->commande) . ' :: ' . ($uglify ?? $uglify->output) . '(' . implode(',', $files) . ')');
+                        die('An error occured while uglifying ' . $hasNonMin . '? ' . $minimized . ': ' . ($uglify ? $uglify->commande : '') . ' :: ' . ($uglify ? $uglify->output : '') . '(' . implode(',', $files) . ')');
                     }
                 }
             }