wip #6549 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 7d20cca136fd5b114f2baa3d5c9409455deca133..7b44f705c5f01de88db2106641c3e0da3c31d960 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -10,7 +10,6 @@ services:
       - '/home/extranet/fonts/:/fonts/'\r
       - '/home/extranet/www/:/application/'\r
       - '/home/extranet/share:/application/share'\r
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/'\r
       - '/mnt/sshfs/kingkong/:/application/usstorage/'\r
       - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player'\r
       - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription'\r
@@ -30,6 +29,8 @@ services:
       - '/home/wesco:/home/wesco'\r
       # Config\r
       - '/home/extranet/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'\r
+      # External\r
+      - 'docs:/application/fluidbook/docs'\r
     ports:\r
       - '54198:80'\r
     environment:\r
@@ -49,7 +50,6 @@ services:
       - '/home/extranet/fonts/:/fonts/'\r
       - '/home/extranet/www/:/application/'\r
       - '/home/extranet/share:/application/share'\r
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/'\r
       - '/mnt/sshfs/kingkong/:/application/usstorage/'\r
       - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player'\r
       - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription'\r
@@ -69,6 +69,8 @@ services:
       - '/home/wesco:/home/wesco'\r
       # Config\r
       - '/home/extranet/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf'\r
+      # External\r
+      - 'docs:/application/fluidbook/docs'\r
     ports:\r
       - '54842:80'\r
     environment:\r
@@ -123,7 +125,6 @@ services:
       - '/home/extranet/fonts/:/fonts/'\r
       - '/home/extranet/www/:/application/'\r
       - '/home/extranet/share:/application/share'\r
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/'\r
       - '/mnt/sshfs/kingkong/:/application/usstorage/'\r
       - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player'\r
       - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription'\r
@@ -141,6 +142,8 @@ services:
       - '/home/toolbox/www:/home/toolbox/www'\r
       - '/data/toolbox/:/data/toolbox/'\r
       - '/home/wesco:/home/wesco'\r
+      # External\r
+      - 'docs:/application/fluidbook/docs'\r
     tmpfs:\r
       #- '/tmp:mode=777,uid=1002,gid=33'\r
       - '/var/log/extranet:uid=1002,gid=33'\r
@@ -177,3 +180,10 @@ networks:
     external:\r
       name: fluidbook-processfarm\r
 \r
+volumes:\r
+  docs:\r
+    driver: ucphhpc/sshfs:latest\r
+    driver_opts:\r
+      sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"\r
+      allow_other: ""\r
+      password: "Qu2E9uq48bBzsqGiZA"\r

diff --git a/.docker/update b/.docker/update
index baf99419dd95c1f6f4a076362418a3aa19d87883..785b2f03bc4b87c392eacf3c9420b24bf92efb6a 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -1,8 +1,10 @@
 #!/bin/sh
 cd /docker/extranet
+docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/extranet/.docker/config/cron/host;ln -sf /home/extranet/.docker/config/cron/host /etc/cron.d/extranet
 docker network create extranet
 ./build
 docker compose down
+docker volume rm extranet_docs
 docker compose up -d
 /home/extranet/www/bin/fixrights
\ No newline at end of file

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 6ff2c7e54e50b3cec26ec14659c19a2263280966..3e4c685ad02482fe9b55e7d6875e70fe60e9513d 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -851,24 +851,25 @@ class commonTools
 
     public static function copyWsAssets()
     {
-        commonDroits::min(5);
-        global $core;
-        $res = commonPage::barre();
-        $res .= commonPage::tMain();
-        $res .= commonPage::bh();
-        $res .= '<form id="copywsassets" action="copywsassets" method="post">';
-        $res .= '<table class="liste">';
-        $res .= '<tr><th><strong>' . __("Copie de fichiers entre deux fluidbook") . '</strong></th></tr>';
-        $res .= '<tr><td>Fluidbook source</td><td>' . form::field('source', 5, 6) . '</td></tr>';
-        $res .= '<tr><td>Fluidbook destination</td><td>' . form::field('dest', 5, 6) . '</td></tr>';
-        $res .= '<tr><td>Fichiers à transférer</td><td id="f">Entrez le numéro du fluidbook source pour sélectionner les fichiers à transférer</td></tr>';
-        $res .= '<tr><td class="right" colspan="2"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Copier')) . '</a></td></td>';
-        $res .= '</table>';
-        $res .= '</form>';
-        $res .= '</div>';
-        $res .= commonPage::bf();
-        $res .= commonPage::bMain();
-        return $res;
+        header('Location: https://toolbox.fluidbook.com/tools/fluidbookcopylinks');
+//        commonDroits::min(5);
+//        global $core;
+//        $res = commonPage::barre();
+//        $res .= commonPage::tMain();
+//        $res .= commonPage::bh();
+//        $res .= '<form id="copywsassets" action="copywsassets" method="post">';
+//        $res .= '<table class="liste">';
+//        $res .= '<tr><th><strong>' . __("Copie de fichiers entre deux fluidbook") . '</strong></th></tr>';
+//        $res .= '<tr><td>Fluidbook source</td><td>' . form::field('source', 5, 6) . '</td></tr>';
+//        $res .= '<tr><td>Fluidbook destination</td><td>' . form::field('dest', 5, 6) . '</td></tr>';
+//        $res .= '<tr><td>Fichiers à transférer</td><td id="f">Entrez le numéro du fluidbook source pour sélectionner les fichiers à transférer</td></tr>';
+//        $res .= '<tr><td class="right" colspan="2"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Copier')) . '</a></td></td>';
+//        $res .= '</table>';
+//        $res .= '</form>';
+//        $res .= '</div>';
+//        $res .= commonPage::bf();
+//        $res .= commonPage::bMain();
+//        return $res;
     }
 
 

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 9525770922fe48c6d954c97ec1f3f1c1e8911029..94c8897d60b9f71dbf532d6e576f40e938606df8 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1584,8 +1584,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 }
 
                 $this->config->audiodescription[$page] = $fname;
-                if(!file_exists($file)){
-                    die('Error making audiodescription file for page '.$page. '('.$engine.')');
+                if (!file_exists($file)) {
+                    die('Error making audiodescription file for page ' . $page . '(' . $engine . ')');
                 }
                 $this->vdir->copy($file, 'data/audiodescription/' . $fname);
             }
@@ -3086,6 +3086,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
         $lessContents = '';
 
+        $this->lessVariables['aftersearch-width'] = $this->lessVariables['aftersearch-height'] = 'auto';
+
         $this->lessVariables['font'] = $this->_font($this->theme->parametres->interfaceFont);
         $this->lessVariables['text-transform'] = $this->_themeBoolean($this->theme->parametres->interfaceFontUppercase) ? 'uppercase' : 'inherit';