From 78ae012db4d655d2d53328b14eebd988ec928c02 Mon Sep 17 00:00:00 2001 From: Israelyan Karen Date: Wed, 18 Dec 2024 20:09:11 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20html=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20lar?= =?UTF-8?q?avel=2011?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 4 ++-- src/Admin.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 866fc038c..b90c259f9 100755 --- a/composer.json +++ b/composer.json @@ -39,11 +39,11 @@ "require": { "php": ">=7.1.3", "ext-json": "*", - "laravel/framework": ">=5.5", + "laravel/framework": ">=11", "kodicomponents/support": "0.*", "kodicomponents/navigation": "0.* || ~1.0", "doctrine/dbal": ">=2.3", - "laravelcollective/html": ">=5.5", + "spatie/laravel-html": "^3.11", "kodicms/laravel-assets": "0.*", "erusev/parsedown": "1.*", "davejamesmiller/laravel-breadcrumbs": ">=4.0", diff --git a/src/Admin.php b/src/Admin.php index 1b27dd006..9b656d507 100755 --- a/src/Admin.php +++ b/src/Admin.php @@ -3,7 +3,7 @@ namespace SleepingOwl\Admin; use Closure; -use Collective\Html\HtmlServiceProvider; +use Spatie\Html\HtmlServiceProvider; use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Support\Renderable; From c14e4fa74f46c2f04d458e3d689c3a85c53ae5c3 Mon Sep 17 00:00:00 2001 From: Israelyan Karen Date: Wed, 18 Dec 2024 21:56:47 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Admin.php b/src/Admin.php index 9b656d507..a5e4444de 100755 --- a/src/Admin.php +++ b/src/Admin.php @@ -3,7 +3,6 @@ namespace SleepingOwl\Admin; use Closure; -use Spatie\Html\HtmlServiceProvider; use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Support\Renderable; @@ -25,6 +24,7 @@ use SleepingOwl\Admin\Providers\AdminServiceProvider; use SleepingOwl\Admin\Providers\AliasesServiceProvider; use SleepingOwl\Admin\Providers\BreadcrumbsServiceProvider; +use Spatie\Html\HtmlServiceProvider; /** * Class Admin. From c3d80a5e6369e1012b8b11e4dc7f168fe6231a8f Mon Sep 17 00:00:00 2001 From: Israelyan Karen Date: Thu, 19 Dec 2024 16:41:20 +0300 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85?= =?UTF-8?q?=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D0=B2=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/sleeping_owl.php | 5 +++-- resources/views/default/column/link.blade.php | 4 +--- resources/views/default/column/url.blade.php | 19 +++++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/config/sleeping_owl.php b/config/sleeping_owl.php index 1d3538deb..0988d0ccd 100755 --- a/config/sleeping_owl.php +++ b/config/sleeping_owl.php @@ -562,8 +562,9 @@ 'Assets' => KodiCMS\Assets\Facades\Assets::class, 'PackageManager' => KodiCMS\Assets\Facades\PackageManager::class, 'Meta' => KodiCMS\Assets\Facades\Meta::class, // will destroy - 'Form' => Collective\Html\FormFacade::class, - 'HTML' => Collective\Html\HtmlFacade::class, + 'Form' => Spatie\Html\Facades\Html::class, + 'HTML' => Spatie\Html\Elements\Element::class, + 'A' => \Spatie\Html\Elements\A::class, 'WysiwygManager' => SleepingOwl\Admin\Facades\WysiwygManager::class, 'MessagesStack' => SleepingOwl\Admin\Facades\MessageStack::class, diff --git a/resources/views/default/column/link.blade.php b/resources/views/default/column/link.blade.php index dfd935148..6ef18a3b8 100755 --- a/resources/views/default/column/link.blade.php +++ b/resources/views/default/column/link.blade.php @@ -1,9 +1,7 @@
@if ($visibled) @if($isEditable) - attributes($linkAttributes) !!}> - {!! $value !!} - + {!! app('A')->attributes($linkAttributes)->href($link)->text($value) !!} @else {!! $value !!} @endif diff --git a/resources/views/default/column/url.blade.php b/resources/views/default/column/url.blade.php index d38e76ca0..f83677471 100755 --- a/resources/views/default/column/url.blade.php +++ b/resources/views/default/column/url.blade.php @@ -1,16 +1,15 @@
@if ($visibled) @if (!empty($value)) - attributes($linkAttributes) }} target="_blank"> - @if($icon) - - @endif - - @if($text) - {{ $text }} - @endif - - + @if($icon) + + @endif + {{ + app('A') + ->attributes([$linkAttributes, 'target'=> '_blank']) + ->href($value) + ->text($text) + }} @endif {!! $append !!} From 79a7a22d0d724f5050b2d363911b2307bfcf8677 Mon Sep 17 00:00:00 2001 From: Israelyan Karen Date: Thu, 19 Dec 2024 16:43:48 +0300 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85?= =?UTF-8?q?=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D0=B2=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/default/column/url.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/default/column/url.blade.php b/resources/views/default/column/url.blade.php index f83677471..5ff7cd5db 100755 --- a/resources/views/default/column/url.blade.php +++ b/resources/views/default/column/url.blade.php @@ -6,7 +6,7 @@ @endif {{ app('A') - ->attributes([$linkAttributes, 'target'=> '_blank']) + ->attributes(array_merge($linkAttributes, ['target'=> '_blank'])) ->href($value) ->text($text) }}