From: Vincent Vanwaelscappel Date: Thu, 3 Nov 2022 19:26:31 +0000 (+0100) Subject: wait #5468 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8ef694f2cbc67c028a1c39b3b0dbb89a1f3b430b;p=fluidbook-toolbox.git wait #5468 @2 --- diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php index 761e46778..623ff3330 100644 --- a/app/Models/FluidbookTheme.php +++ b/app/Models/FluidbookTheme.php @@ -214,7 +214,6 @@ class FluidbookTheme extends ToolboxSettingsModel 'label' => __('Icônes et symboles'), ]); - $this->addField([ 'name' => 'iconSet', 'type' => SelectFromModel::class, @@ -241,7 +240,6 @@ class FluidbookTheme extends ToolboxSettingsModel 'translatable' => false, ]); - $this->addField([ 'name' => 'section_effects', 'type' => 'FormSection', diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index a4c617691..8eb592445 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -18,7 +18,10 @@ use Cubist\Backpack\Magic\Fields\ReadOnlyValue; use Cubist\Backpack\Magic\Fields\SelectFromArray; use Cubist\Backpack\Magic\Fields\Textarea; - +/** + * Run after change to propagate on legacy Fluidbook Workshop + * php artisan job:dispatchNow LegacyBookSettingsGenerate + */ trait PublicationSettings { public function setSettingsFields() @@ -2537,6 +2540,7 @@ trait PublicationSettings 'Remarkable' => 'Remarkable', 'Mopec' => 'Mopec', 'Puma' => 'Puma', + 'Puma-SE' => 'Puma South Europe', 'MIF' => 'MIF', 'Flexipan' => 'Flexipan', 'ZoomProductLink' => 'Zoom + lien produit (déprécié, utiliser la fonctionnalité "Zoom produits")', diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php index 3180d0204..22abc8b76 100644 --- a/app/SubForms/Link/Base.php +++ b/app/SubForms/Link/Base.php @@ -5,9 +5,12 @@ namespace App\SubForms\Link; use App\Fields\FluidbookLinkEditor\Depth; use App\Fields\FluidbookLinkEditor\LinkType; use App\Fields\FluidbookLinkEditor\MultimediaIntegration; +use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\FieldGroupEnd; +use Cubist\Backpack\Magic\Fields\FieldGroupStart; use Cubist\Backpack\Magic\Fields\FormSection; -use Cubist\Backpack\Magic\Fields\Number; use Cubist\Backpack\Magic\Fields\Text; +use Cubist\Backpack\Magic\Fields\Textarea; use Cubist\Backpack\Magic\Form; class Base extends Form @@ -61,6 +64,7 @@ class Base extends Form protected $_displayedOnFluidbook = true; protected $_integration = false; protected $_multimedia = false; + protected $_tooltip = true; /** * @return array[] @@ -129,11 +133,21 @@ class Base extends Form $this->addTypeField(); $this->addSettingsFields(); $this->addAppearanceFields(); - $this->addPositionFields(); + $this->addTooltipFields(); $this->addPositionFields(); $this->addExtraFields(); } + public function addTooltipFields() + { + if (!$this->_tooltip) { + return; + } + $this->addField('header_tooltip', FormSection::class, __('Infobulles')); + $this->addField('tooltip', Text::class, __('Texte de l\'infobulle'), ['hint' => __('Laisser vide pour conserver le texte par défaut')]); + $this->addField('display_area', Checkbox::class, __('Afficher la zone de couleur au survol')); + } + public function addTypeField() { $this->addField('type', LinkType::class, __('Type de lien')); @@ -180,19 +194,28 @@ class Base extends Form public function addPositionFields() { $this->addField('header_disposition', FormSection::class, __('Disposition')); + $this->addField('group_disposition', FieldGroupStart::class); + $this->addField('group_position', FieldGroupStart::class, __('Position')); $this->addField('x', Text::class, 'X'); $this->addField('y', Text::class, 'Y'); + $this->addField('group_position_end', FieldGroupEnd::class); + $this->addField('group_dimensions', FieldGroupStart::class, __('Dimensions')); $this->addField('w', Text::class, 'W'); $this->addField('h', Text::class, 'H'); + $this->addField('group_dimensions_end', FieldGroupEnd::class); if ($this->_displayedOnFluidbook) { + $this->addField('group_transform', FieldGroupStart::class); $this->addField('rot', Text::class, __('Rotation'), ['suffix' => '°']); + $this->addField('group_transform_end', FieldGroupEnd::class); $this->addField('zindex', Depth::class, __('Profondeur')); } + $this->addField('group_disposition_end', FieldGroupEnd::class); } public function addExtraFields() { $this->addField('header_extra', FormSection::class, __('Autres paramètres')); + $this->addField('extra', Textarea::class); } public function getType() diff --git a/composer.lock b/composer.lock index ab1479f7e..6fe4e97da 100644 --- a/composer.lock +++ b/composer.lock @@ -1661,13 +1661,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "5ae2e16981296ac44f6951788c208c67c1a06c99" + "reference": "0f0dca276748e1bd7e17f7bd50f8298acc75850a" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-14a769.tar", - "reference": "5ae2e16981296ac44f6951788c208c67c1a06c99", - "shasum": "58bd795a0542472825e6c0a303dfbc58612be06b" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-4f5da8.tar", + "reference": "0f0dca276748e1bd7e17f7bd50f8298acc75850a", + "shasum": "165263152ccbb3023e2f47987a952d6c3234862f" }, "require": { "backpack/backupmanager": "^3.0", @@ -1748,7 +1748,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2022-10-20T15:02:54+00:00" + "time": "2022-11-03T18:49:30+00:00" }, { "name": "cubist/cms-front", @@ -2519,23 +2519,23 @@ }, { "name": "doctrine/dbal", - "version": "3.4.5", + "version": "3.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e" + "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/a5a58773109c0abb13e658c8ccd92aeec8d07f9e", - "reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5", + "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5", "shasum": "" }, "require": { "composer-runtime-api": "^2", "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3|^1", - "doctrine/event-manager": "^1.0", + "doctrine/event-manager": "^1|^2", "php": "^7.4 || ^8.0", "psr/cache": "^1|^2|^3", "psr/log": "^1|^2|^3" @@ -2543,14 +2543,14 @@ "require-dev": { "doctrine/coding-standard": "10.0.0", "jetbrains/phpstorm-stubs": "2022.2", - "phpstan/phpstan": "1.8.3", - "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "9.5.24", + "phpstan/phpstan": "1.8.10", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "9.5.25", "psalm/plugin-phpunit": "0.17.0", "squizlabs/php_codesniffer": "3.7.1", "symfony/cache": "^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0", - "vimeo/psalm": "4.27.0" + "vimeo/psalm": "4.29.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -2610,7 +2610,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.4.5" + "source": "https://github.com/doctrine/dbal/tree/3.5.1" }, "funding": [ { @@ -2626,7 +2626,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T17:48:57+00:00" + "time": "2022-10-24T07:26:18+00:00" }, { "name": "doctrine/deprecations", @@ -2673,30 +2673,29 @@ }, { "name": "doctrine/event-manager", - "version": "1.2.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "conflict": { "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.24" + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.28" }, "type": "library", "autoload": { @@ -2745,7 +2744,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" + "source": "https://github.com/doctrine/event-manager/tree/2.0.0" }, "funding": [ { @@ -2761,7 +2760,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T20:51:15+00:00" + "time": "2022-10-12T20:59:15+00:00" }, { "name": "doctrine/inflector", @@ -3271,23 +3270,23 @@ }, { "name": "ezimuel/guzzlestreams", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/ezimuel/guzzlestreams.git", - "reference": "abe3791d231167f14eb80d413420d1eab91163a8" + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8", - "reference": "abe3791d231167f14eb80d413420d1eab91163a8", + "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~9.0" }, "type": "library", "extra": { @@ -3318,22 +3317,22 @@ "stream" ], "support": { - "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1" + "source": "https://github.com/ezimuel/guzzlestreams/tree/3.1.0" }, - "time": "2020-02-14T23:11:50+00:00" + "time": "2022-10-24T12:58:50+00:00" }, { "name": "ezimuel/ringphp", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/ezimuel/ringphp.git", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74" + "reference": "8d00384f9e5c04713ef8448adf47824265791b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/92b8161404ab1ad84059ebed41d9f757e897ce74", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74", + "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/8d00384f9e5c04713ef8448adf47824265791b50", + "reference": "8d00384f9e5c04713ef8448adf47824265791b50", "shasum": "" }, "require": { @@ -3375,9 +3374,9 @@ ], "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.2.0" + "source": "https://github.com/ezimuel/ringphp/tree/1.2.1" }, - "time": "2021-11-16T11:51:30+00:00" + "time": "2022-10-25T12:54:22+00:00" }, { "name": "ezyang/htmlpurifier", @@ -3504,13 +3503,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "f5a47cc5234847658573cc93a993ce1125fe17c5" + "reference": "af0ea5caf21fa78776448e3b0f5c26de5c27585c" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-fc36f5.tar", - "reference": "f5a47cc5234847658573cc93a993ce1125fe17c5", - "shasum": "96aac03396da48b6a40e57d8b6f4ad771df10634" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-a5d8e4.tar", + "reference": "af0ea5caf21fa78776448e3b0f5c26de5c27585c", + "shasum": "dc04020c5f61af1a705fa81b07bb834d06910673" }, "require": { "barryvdh/laravel-debugbar": "^3.6", @@ -3544,7 +3543,7 @@ } ], "description": "Fluidbook Tools", - "time": "2022-10-07T16:42:24+00:00" + "time": "2022-11-03T14:13:36+00:00" }, { "name": "genealabs/laravel-model-caching", @@ -4324,7 +4323,7 @@ }, { "name": "jane-php/json-schema-runtime", - "version": "v7.3.1", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/janephp/json-schema-runtime.git", @@ -4380,13 +4379,13 @@ ], "description": "Jane runtime Library", "support": { - "source": "https://github.com/janephp/json-schema-runtime/tree/v7.3.1" + "source": "https://github.com/janephp/json-schema-runtime/tree/v7.3.2" }, "time": "2021-12-16T13:26:58+00:00" }, { "name": "jane-php/open-api-runtime", - "version": "v7.3.1", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/janephp/open-api-runtime.git", @@ -4443,7 +4442,7 @@ ], "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi", "support": { - "source": "https://github.com/janephp/open-api-runtime/tree/v7.3.1" + "source": "https://github.com/janephp/open-api-runtime/tree/v7.3.2" }, "time": "2021-12-16T13:26:58+00:00" }, @@ -4835,16 +4834,16 @@ }, { "name": "laravel/framework", - "version": "v8.83.25", + "version": "v8.83.26", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b77b908a9426efa41d6286a2ef4c3adbf5398ca1" + "reference": "7411d9fa71c1b0fd73a33e225f14512b74e6c81e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b77b908a9426efa41d6286a2ef4c3adbf5398ca1", - "reference": "b77b908a9426efa41d6286a2ef4c3adbf5398ca1", + "url": "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e", + "reference": "7411d9fa71c1b0fd73a33e225f14512b74e6c81e", "shasum": "" }, "require": { @@ -5004,7 +5003,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-09-30T13:00:40+00:00" + "time": "2022-11-01T14:48:50+00:00" }, { "name": "laravel/serializable-closure", @@ -8883,16 +8882,16 @@ }, { "name": "spatie/laravel-permission", - "version": "5.5.12", + "version": "5.5.16", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "81254462a93ed274d3e18159f04f5e842f813d00" + "reference": "e57a67b51a02cbfcd074ed68786897db1dbbf2fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/81254462a93ed274d3e18159f04f5e842f813d00", - "reference": "81254462a93ed274d3e18159f04f5e842f813d00", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/e57a67b51a02cbfcd074ed68786897db1dbbf2fa", + "reference": "e57a67b51a02cbfcd074ed68786897db1dbbf2fa", "shasum": "" }, "require": { @@ -8953,7 +8952,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/5.5.12" + "source": "https://github.com/spatie/laravel-permission/tree/5.5.16" }, "funding": [ { @@ -8961,7 +8960,7 @@ "type": "github" } ], - "time": "2022-10-19T20:26:33+00:00" + "time": "2022-10-23T02:49:28+00:00" }, { "name": "spatie/laravel-signal-aware-command", @@ -9242,16 +9241,16 @@ }, { "name": "swayok/alternative-laravel-cache", - "version": "6.1.7", + "version": "6.1.8", "source": { "type": "git", "url": "https://github.com/swayok/alternative-laravel-cache.git", - "reference": "40d72d0998a19e17bcb9d278faf5e7b3b27732dd" + "reference": "e3aa7c2940c524e4628966ae6127952371a76417" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/40d72d0998a19e17bcb9d278faf5e7b3b27732dd", - "reference": "40d72d0998a19e17bcb9d278faf5e7b3b27732dd", + "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/e3aa7c2940c524e4628966ae6127952371a76417", + "reference": "e3aa7c2940c524e4628966ae6127952371a76417", "shasum": "" }, "require": { @@ -9306,9 +9305,9 @@ ], "support": { "issues": "https://github.com/swayok/alternative-laravel-cache/issues", - "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.7" + "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.8" }, - "time": "2022-10-03T19:26:25+00:00" + "time": "2022-10-29T20:03:06+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -9388,16 +9387,16 @@ }, { "name": "symfony/console", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d" + "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/984ea2c0f45f42dfed01d2f3987b187467c4b16d", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d", + "url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669", + "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669", "shasum": "" }, "require": { @@ -9467,7 +9466,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.14" + "source": "https://github.com/symfony/console/tree/v5.4.15" }, "funding": [ { @@ -9483,7 +9482,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2022-10-26T21:41:52+00:00" }, { "name": "symfony/css-selector", @@ -9619,16 +9618,16 @@ }, { "name": "symfony/error-handler", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "5fe6d42ffeb68b094df8fdbf3acf23f391cc6be0" + "reference": "539cf1428b8442303c6e876ad7bf5a7babd91091" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/5fe6d42ffeb68b094df8fdbf3acf23f391cc6be0", - "reference": "5fe6d42ffeb68b094df8fdbf3acf23f391cc6be0", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091", + "reference": "539cf1428b8442303c6e876ad7bf5a7babd91091", "shasum": "" }, "require": { @@ -9670,7 +9669,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.14" + "source": "https://github.com/symfony/error-handler/tree/v5.4.15" }, "funding": [ { @@ -9686,7 +9685,7 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:50+00:00" + "time": "2022-10-27T06:32:25+00:00" }, { "name": "symfony/event-dispatcher", @@ -9978,16 +9977,16 @@ }, { "name": "symfony/http-client", - "version": "v6.1.6", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "c8c887f4813370550147afd27d9eb8a8523e53b2" + "reference": "f515d066728774efb34347a87580621416ca8968" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/c8c887f4813370550147afd27d9eb8a8523e53b2", - "reference": "c8c887f4813370550147afd27d9eb8a8523e53b2", + "url": "https://api.github.com/repos/symfony/http-client/zipball/f515d066728774efb34347a87580621416ca8968", + "reference": "f515d066728774efb34347a87580621416ca8968", "shasum": "" }, "require": { @@ -10042,7 +10041,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v6.1.6" + "source": "https://github.com/symfony/http-client/tree/v6.1.7" }, "funding": [ { @@ -10058,7 +10057,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T05:10:31+00:00" + "time": "2022-10-28T16:23:08+00:00" }, { "name": "symfony/http-client-contracts", @@ -10143,16 +10142,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e7c7b395c3a61d746919c21e915f51f0039c3f75" + "reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e7c7b395c3a61d746919c21e915f51f0039c3f75", - "reference": "e7c7b395c3a61d746919c21e915f51f0039c3f75", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3", + "reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3", "shasum": "" }, "require": { @@ -10199,7 +10198,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.14" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.15" }, "funding": [ { @@ -10215,20 +10214,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:59:28+00:00" + "time": "2022-10-12T09:43:19+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6f77fabc1a37c2dceecc6f78cca44772705dc52f" + "reference": "fc63c8c3e1036d424820cc993a4ea163778dc5c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6f77fabc1a37c2dceecc6f78cca44772705dc52f", - "reference": "6f77fabc1a37c2dceecc6f78cca44772705dc52f", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7", + "reference": "fc63c8c3e1036d424820cc993a4ea163778dc5c7", "shasum": "" }, "require": { @@ -10311,7 +10310,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.14" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.15" }, "funding": [ { @@ -10327,7 +10326,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:12:21+00:00" + "time": "2022-10-28T17:52:18+00:00" }, { "name": "symfony/mime", @@ -11361,16 +11360,16 @@ }, { "name": "symfony/routing", - "version": "v5.4.11", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226" + "reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/3e01ccd9b2a3a4167ba2b3c53612762300300226", - "reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226", + "url": "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69", + "reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69", "shasum": "" }, "require": { @@ -11431,7 +11430,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.11" + "source": "https://github.com/symfony/routing/tree/v5.4.15" }, "funding": [ { @@ -11447,7 +11446,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2022-10-13T14:10:41+00:00" }, { "name": "symfony/serializer", @@ -11635,16 +11634,16 @@ }, { "name": "symfony/string", - "version": "v6.1.6", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864" + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7e7e0ff180d4c5a6636eaad57b65092014b61864", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864", + "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5", + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5", "shasum": "" }, "require": { @@ -11700,7 +11699,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.6" + "source": "https://github.com/symfony/string/tree/v6.1.7" }, "funding": [ { @@ -12574,23 +12573,23 @@ }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.6", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16" + "reference": "bf44b757feb8ba1734659029357646466ded673e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e", + "reference": "bf44b757feb8ba1734659029357646466ded673e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" + "phpunit/phpunit": "^8.5.14|^9" }, "suggest": { "dflydev/markdown": "~1.0", @@ -12620,9 +12619,9 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0" }, - "time": "2018-12-13T10:34:14+00:00" + "time": "2022-10-31T15:35:43+00:00" }, { "name": "composer/pcre", @@ -12963,16 +12962,16 @@ }, { "name": "filp/whoops", - "version": "2.14.5", + "version": "2.14.6", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" + "reference": "f7948baaa0330277c729714910336383286305da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da", + "reference": "f7948baaa0330277c729714910336383286305da", "shasum": "" }, "require": { @@ -13022,7 +13021,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.5" + "source": "https://github.com/filp/whoops/tree/2.14.6" }, "funding": [ { @@ -13030,7 +13029,7 @@ "type": "github" } ], - "time": "2022-01-07T12:00:00+00:00" + "time": "2022-11-02T16:23:29+00:00" }, { "name": "fzaninotto/faker", @@ -13999,16 +13998,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.30", + "version": "8.5.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "4fd448df9affda65a5faa58f8b93087d415216ce" + "reference": "33c126b09a42de5c99e5e8032b54e8221264a74e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4fd448df9affda65a5faa58f8b93087d415216ce", - "reference": "4fd448df9affda65a5faa58f8b93087d415216ce", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/33c126b09a42de5c99e5e8032b54e8221264a74e", + "reference": "33c126b09a42de5c99e5e8032b54e8221264a74e", "shasum": "" }, "require": { @@ -14076,7 +14075,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.30" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.31" }, "funding": [ { @@ -14092,7 +14091,7 @@ "type": "tidelift" } ], - "time": "2022-09-25T03:43:00+00:00" + "time": "2022-10-28T05:57:37+00:00" }, { "name": "psy/psysh", diff --git a/config/app.php b/config/app.php index 65ad315fb..9ebb1a97c 100644 --- a/config/app.php +++ b/config/app.php @@ -39,7 +39,7 @@ return [ | */ - 'debug' => env('APP_DEBUG', false), + 'debug' => !isset($_SERVER['HTTP_X_REAL_IP']) || in_array($_SERVER['HTTP_X_REAL_IP'], ['130.180.213.67']), /* |-------------------------------------------------------------------------- diff --git a/resources/linkeditor/style/form.sass b/resources/linkeditor/style/form.sass index 6d8ac9ea5..525682f3f 100644 --- a/resources/linkeditor/style/form.sass +++ b/resources/linkeditor/style/form.sass @@ -39,7 +39,7 @@ border-top: 1px solid #5d5d5d margin-top: 20px - input, textarea, input[type="text"], input[type="number"], input[type="email"], input[type="url"] + textarea, input[type="text"], input[type="number"], input[type="email"], input[type="url"] font-family: $font height: 34px padding: 8px @@ -56,9 +56,56 @@ border: 1px solid #ccc box-shadow: 0 0 8px rgba(0, 0, 0, 0.1) + textarea + min-height: 150px + max-width: 100% + min-width: 100% + + span + font-weight: 600 + font-size: 12px + color: #5D5D5D + label display: block font-weight: 600 font-size: 12px color: #5D5D5D margin: 8px 0 5px 0 + + .checkbox + margin: 4px 0 5px 0 + + label + vertical-align: baseline + display: inline-block + position: relative + top: 2px + + span + margin-left: 5px + + + #group_position, #group_dimensions, #group_transform + margin-top: 5px + h4 + font-size: 12px + font-weight: 700 + color: #5D5D5D + grid-column: 1 / 3 + grid-row: 1 / 2 + margin-bottom: 5px + + display: grid + grid-template-columns: repeat( 2, 1fr) + grid-gap: 2px 25px + + label + display: inline-block + width: 20px + input + width: calc(100% - 20px) + + #group_transform + input + width: 100% diff --git a/resources/linkeditor/style/mixins.sass b/resources/linkeditor/style/mixins.sass new file mode 100644 index 000000000..b21a11790 --- /dev/null +++ b/resources/linkeditor/style/mixins.sass @@ -0,0 +1,15 @@ +@mixin tinyscrollbars + &::-webkit-scrollbar + width: 6px + height: 6px + + &::-webkit-scrollbar-track + background: transparent + + &:hover + background-color: #000 + + &::-webkit-scrollbar-thumb + background-color: #aaa + border: 1px solid #333 + border-radius: 20px diff --git a/resources/linkeditor/style/panels.sass b/resources/linkeditor/style/panels.sass index 20f9aa00a..f459fd531 100644 --- a/resources/linkeditor/style/panels.sass +++ b/resources/linkeditor/style/panels.sass @@ -56,6 +56,9 @@ margin-left: $sidebar-icons-width margin-right: $sidebar-handle-width + overflow-x: hidden + @include tinyscrollbars + background: $panel-background height: 100% @media (prefers-color-scheme: dark) diff --git a/resources/linkeditor/style/style.sass b/resources/linkeditor/style/style.sass index 471eb9a00..b5b0524e5 100644 --- a/resources/linkeditor/style/style.sass +++ b/resources/linkeditor/style/style.sass @@ -1,5 +1,6 @@ @import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap') @import "variables" +@import "mixins" * margin: 0 @@ -89,20 +90,7 @@ body, #linkeditor, html max-width: calc(100% - $rulers-size) overflow: auto - &::-webkit-scrollbar - width: 6px - height: 6px - - &::-webkit-scrollbar-track - background: transparent - - &:hover - background-color: #000 - - &::-webkit-scrollbar-thumb - background-color: #aaa - border: 1px solid #333 - border-radius: 20px + @include tinyscrollbars #linkeditor-fluidbook transform-origin: 0 0