From: Vincent Vanwaelscappel Date: Fri, 31 Jan 2025 13:49:50 +0000 (+0100) Subject: wait #7299 @0.75 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=aef516f4d6cafe30840619c05d7c15663ecf9e69;p=fluidbook-toolbox.git wait #7299 @0.75 --- diff --git a/app/Fluidbook/Compiler/Links.php b/app/Fluidbook/Compiler/Links.php index 2e76c3e6c..bc310501a 100644 --- a/app/Fluidbook/Compiler/Links.php +++ b/app/Fluidbook/Compiler/Links.php @@ -187,7 +187,7 @@ trait Links $dupData = $linkData; $dupData['image'] = ''; $dupData['animation'] = ''; - $dupData['inline'] = true; + $dupData['inline'] = 'inline'; $dupData['interactive'] = false; $dupData['to'] = $linkData['animation']; $dupData['type'] = Link::MULTIMEDIA; diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php index 3af696a7a..c56fcca83 100644 --- a/app/Fluidbook/Farm.php +++ b/app/Fluidbook/Farm.php @@ -15,18 +15,18 @@ class Farm { protected static $_outPDF = []; protected static $_forceServer = false; - //protected static $_forceServer = 'alphaville'; + //protected static $_forceServer = 'amadeus'; protected static $_region = Region::EUROPE; protected static $_farmServers = [ - ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE, 'local' => false], - ['name' => 'cloudatlas', 'host' => 'cloudatlas.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE, 'local' => false], + ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE, 'local' => false], + ['name' => 'cloudatlas', 'host' => 'cloudatlas.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE, 'local' => false], ['name' => 'elephantman', 'host' => 'paris.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'port' => 9460, 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], - ['name' => 'isleofdogs', 'host' => 'paris.cubedesigners.com', 'port' => 9458, 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], - ['name' => 'jumanji', 'host' => 'paris.cubedesigners.com', 'port' => 9459, 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], + ['name' => 'isleofdogs', 'host' => 'paris.cubedesigners.com', 'port' => 9458, 'weight' => 4, 'region' => Region::EUROPE, 'local' => false], + ['name' => 'jumanji', 'host' => 'paris.cubedesigners.com', 'port' => 9459, 'weight' => 6, 'region' => Region::EUROPE, 'local' => false], ['name' => 'kingkong', 'host' => 'kingkong.cubedesigners.com', 'weight' => 6, 'region' => Region::USA, 'local' => true], ];