From: Vincent Vanwaelscappel Date: Wed, 21 May 2025 17:49:34 +0000 (+0200) Subject: wip #7467 @6 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fc3d60ecb46bff090f2af12285d915c39d19c4c0;p=fluidbook-toolbox.git wip #7467 @6 --- diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index 40f9467d2..c465adb44 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.1' services: php-fpm: container_name: fluidbook-toolbox-dev @@ -17,13 +16,18 @@ services: - '/home/extranet/share/:/application/share/' - '/data/toolbox/dev/storage/:/application/storage/' - '/data/extranet/ftp/:/application/ftp/' - - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/' - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/' - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' + - '/data/fluidbook/pdfcache/:/application/protected/fluidbookpublication/cache/pdffiles/' - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/' - # DEV - - '/home/toolbox/www/resources/fluidbookpublication/player/:/application/resources/fluidbookpublication/player/' + - '/data/toolbox/protected/fluidbookpublication/final/:/application/protected/fluidbookpublication/final/' + - '/data/toolbox/protected/fluidbookpublication/packager/:/application/protected/fluidbookpublication/packager/' + - '/data/toolbox/protected/fluidbookpublication/seo/:/application/protected/fluidbookpublication/seo/' + - '/data/toolbox/protected/fluidbookcollection/:/application/protected/fluidbookcollection/' + # Local mounts + - "/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/" + - "/data/fluidbook/assets/:/application/protected/fluidbookpublication/working/" # Startup - '/home/toolbox/dev/bin/startup.sh:/usr/bin/startup.sh' # SSH @@ -61,6 +65,8 @@ services: # PHP - '/home/toolbox/dev/.docker/config/php/php.ini:/etc/php/8.4/fpm/conf.d/99-overrides.ini' - '/home/toolbox/dev/.docker/config/php/fpm.conf:/etc/php/8.4/fpm/pool.d/z-overrides.conf' + # DEV + - '/home/toolbox/www/resources/fluidbookpublication/player/:/application/resources/fluidbookpublication/player/' # ENV - '/home/toolbox/dev/.env.dev:/application/.env' ports: @@ -84,16 +90,23 @@ services: - '/home/extranet/share/:/application/share/' - '/data/toolbox/dev/storage/:/application/storage/' - '/data/extranet/ftp/:/application/ftp/' - - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/' +# - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/' - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/' - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/' + - '/data/fluidbook/pdfcache/:/application/protected/fluidbookpublication/cache/pdffiles/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/' + - '/data/toolbox/protected/fluidbookpublication/final/:/application/protected/fluidbookpublication/final/' + - '/data/toolbox/protected/fluidbookpublication/packager/:/application/protected/fluidbookpublication/packager/' + - '/data/toolbox/protected/fluidbookpublication/seo/:/application/protected/fluidbookpublication/seo/' + - '/data/toolbox/protected/fluidbookcollection/:/application/protected/fluidbookcollection/' + # Local mounts + - "/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/" + - "/data/fluidbook/assets/:/application/protected/fluidbookpublication/working/" # Config - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf' # External volume - - 'usstoragedev:/application/usstorage:ro' - - 'docs1:/application/protected/fluidbookpublication/docs:ro' + - 'usstorage1:/application/usstorage:ro' environment: VIRTUAL_HOST: dev.toolbox.fluidbook.com LETSENCRYPT_HOST: dev.toolbox.fluidbook.com @@ -132,6 +145,7 @@ services: - "/home/toolbox/dev/.docker/config/mariadb:/etc/mysql/conf.d:z" networks: - fluidbook-toolbox-dev + - extranet redis: container_name: fluidbook-toolbox-dev-redis @@ -160,30 +174,25 @@ services: networks: fluidbook-toolbox-dev: - external: - name: fluidbook-toolbox-dev + name: fluidbook-toolbox-dev + external: true fluidbook-processfarm: - external: - name: fluidbook-processfarm + name: fluidbook-processfarm + external: true nginxproxy: - external: - name: nginxproxy + name: nginxproxy + external: true + extranet: + name: extranet + external: true volumes: - usstoragedev: + usstorage1: driver: ucphhpc/sshfs:latest driver_opts: sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data" allow_other: "" - cache: "no" - uid: 1001 - gid: 33 password: "Qu2E9uq48bBzsqGiZA" + reconnect: "" + - docs1: - driver: ucphhpc/sshfs:latest - driver_opts: - sshcmd: "fluidbook@docs.toolbox.fluidbook.com:/data" - allow_other: "" - password: "Qu2E9uq48bBzsqGiZA" - port: "7552" diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 70a707034..ad7035ac4 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -108,8 +108,6 @@ services: - '/home/toolbox/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' # External volume - 'usstorage1:/application/usstorage:ro' - ports: - - '37126:80' environment: VIRTUAL_HOST: toolbox.fluidbook.com LETSENCRYPT_HOST: toolbox.fluidbook.com @@ -122,8 +120,6 @@ services: image: adminer:latest container_name: fluidbook-toolbox-adminer restart: unless-stopped - ports: - - 52108:8080 volumes: - '/home/toolbox/www/.docker/config/adminer/php.ini:/etc/php/7.4/fpm/conf.d/settings.ini' - '/home/toolbox/www/.docker/config/adminer/php.ini:/etc/php/7.4/cli/conf.d/settings.ini' diff --git a/bin/startup.sh b/bin/startup.sh index 0f937d15e..89eabd8f2 100644 --- a/bin/startup.sh +++ b/bin/startup.sh @@ -43,5 +43,5 @@ chown -R root:root /etc/monit && /usr/bin/monit /application/bin/mount.sh & # Launch PHP -/usr/sbin/php-fpm8.2 -O +/usr/sbin/php-fpm8.4 -O diff --git a/resources/linkeditor-stable/js/linkeditor.panels.js b/resources/linkeditor-stable/js/linkeditor.panels.js index 66c6d5ef4..615c18bba 100644 --- a/resources/linkeditor-stable/js/linkeditor.panels.js +++ b/resources/linkeditor-stable/js/linkeditor.panels.js @@ -11,7 +11,10 @@ LinkeditorPanels.prototype = { init: function () { var $this = this; - this.sides = this.linkeditor.settings.get('panels_layout', {left: ['layers', 'versions'], right: ['form']}); + this.sides = this.linkeditor.settings.get('panels_layout', { + left: ['layers', 'accessibility', 'versions'], + right: ['form'] + }); $.each(this.sides, function (side, panels) { var panelsContainer = $("#linkeditor-" + side + '-panel'); panelsContainer.data('width', $this.normalizeWidth($this.linkeditor.settings.get(side + '_width', $this.defaultWidth))); @@ -112,6 +115,9 @@ LinkeditorPanels.prototype = { toggleForm: function () { this.togglePanel('form'); }, + toggleAccessibility: function () { + this.togglePanel('accessibility'); + }, togglePanel: function (panel) { this.setPanelState(panel, 'toggle'); this.linkeditor.layers.update(); diff --git a/resources/linkeditor/js/linkeditor.panels.js b/resources/linkeditor/js/linkeditor.panels.js index cc0e272b6..341fe4ad3 100644 --- a/resources/linkeditor/js/linkeditor.panels.js +++ b/resources/linkeditor/js/linkeditor.panels.js @@ -11,12 +11,15 @@ LinkeditorPanels.prototype = { init: function () { var $this = this; - this.sides = this.linkeditor.settings.get('panels_layout', {left: ['layers', 'versions'], right: ['form']}); + this.sides = this.linkeditor.settings.get('panels_layout', { + left: ['layers', 'versions', 'accessibility'], + right: ['form'] + }); $.each(this.sides, function (side, panels) { + console.log(side, panels); var panelsContainer = $("#linkeditor-" + side + '-panel'); panelsContainer.data('width', $this.normalizeWidth($this.linkeditor.settings.get(side + '_width', $this.defaultWidth))); - $.each(panels, function (k, panel) { $("#linkeditor-" + side + " nav").append($("#linkeditor-icon-" + panel)); if ($('#linkeditor-panel-' + panel).length > 0) { diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php index 452f98052..fc6bed99d 100644 --- a/resources/views/fluidbook_publication/link_editor.blade.php +++ b/resources/views/fluidbook_publication/link_editor.blade.php @@ -116,9 +116,12 @@ $settings=[ 'left_open'=>false, 'left_width'=>20,'left_tool'=>'layers', 'right_open'=>true,'right_width'=>20,'right_tool'=>'form', - 'panels_layout'=>['left'=>['layers','versions'],'right'=>['form']] + 'panels_layout'=>['left'=>['layers','versions','accessibility'],'right'=>['form']] ]; foreach ($settings as $k=>$v) { + if($k==='panels_layout'){ + continue; + } $settings[$k]=$user->getToolboxSetting('linkeditor_'.$k,$v); } $assets=$fluidbook->getLinksAssetsDimensions(); @@ -209,6 +212,9 @@ +
diff --git a/resources/views/fluidbook_publication/link_editor_icons.blade.php b/resources/views/fluidbook_publication/link_editor_icons.blade.php index 1b8a4fd5c..348f82eea 100644 --- a/resources/views/fluidbook_publication/link_editor_icons.blade.php +++ b/resources/views/fluidbook_publication/link_editor_icons.blade.php @@ -1,48 +1,47 @@ {{-- -Downloaded from https://dev.toolbox.fluidbook.com/tool-sprite/3/download -Edit here : https://dev.toolbox.fluidbook.com/tool-sprite/3/edit +Downloaded from https://toolbox.fluidbook.com/tool-sprite/3/download +Edit here : https://toolbox.fluidbook.com/tool-sprite/3/edit ---}} -@push('linkeditor_scripts') - -@endpush +