From fb303dedf354372ad10e6c8e29855dc3a61eb9a1 Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 10:41:42 +0100 Subject: [PATCH 1/9] Add icon for unknown search drivers Signed-off-by: Philipp Daun --- resources/svg/search-drivers/unknown.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 resources/svg/search-drivers/unknown.svg diff --git a/resources/svg/search-drivers/unknown.svg b/resources/svg/search-drivers/unknown.svg new file mode 100644 index 0000000000..f6f100ad68 --- /dev/null +++ b/resources/svg/search-drivers/unknown.svg @@ -0,0 +1 @@ + From 772d6c71447a554a5d1b1764b96be974b5d54594 Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 10:41:51 +0100 Subject: [PATCH 2/9] Add icon for loupe search driver Signed-off-by: Philipp Daun --- resources/svg/search-drivers/loupe.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 resources/svg/search-drivers/loupe.svg diff --git a/resources/svg/search-drivers/loupe.svg b/resources/svg/search-drivers/loupe.svg new file mode 100644 index 0000000000..41307fba47 --- /dev/null +++ b/resources/svg/search-drivers/loupe.svg @@ -0,0 +1 @@ + From 12292b1bcb1af080767d618041e2d9ed2d6720a5 Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 10:42:04 +0100 Subject: [PATCH 3/9] Allow setting fallback svg Signed-off-by: Philipp Daun --- src/Statamic.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Statamic.php b/src/Statamic.php index 272b0bf94e..1af2278c34 100644 --- a/src/Statamic.php +++ b/src/Statamic.php @@ -242,15 +242,18 @@ public static function provideToScript(array $variables) return new static; } - public static function svg($name, $attrs = null) + public static function svg($name, $attrs = null, $fallback = null) { if ($attrs) { $attrs = " class=\"{$attrs}\""; } - $svg = StaticStringy::collapseWhitespace( - File::get(statamic_path("resources/svg/{$name}.svg")) - ); + $path = statamic_path("resources/svg/{$name}.svg"); + if ($fallback && ! File::exists($path)) { + $path = statamic_path("resources/svg/{$fallback}.svg"); + } + + $svg = StaticStringy::collapseWhitespace(File::get($path)); return str_replace(' Date: Tue, 26 Nov 2024 10:42:24 +0100 Subject: [PATCH 4/9] Set fallback icon for unknown search drivers Signed-off-by: Philipp Daun --- resources/views/utilities/search.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index 03e8886adf..b081d87d74 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -42,7 +42,7 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) - @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2') + @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2', 'unknown')
{{ $index->title() }}
From b7314699e07b9ac2b2fd9a2ab4766e036e393c10 Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 10:42:37 +0100 Subject: [PATCH 5/9] Avoid search driver icons shrinking Signed-off-by: Philipp Daun --- resources/views/utilities/search.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index b081d87d74..b68e661725 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -42,7 +42,7 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) - @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2', 'unknown') + @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2 shrink-0', 'unknown')
{{ $index->title() }}
From 67186a07088450925b5e443b17ac9f78e1d3e364 Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 10:59:52 +0100 Subject: [PATCH 6/9] Adjust alignment Signed-off-by: Philipp Daun --- resources/views/utilities/search.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index b68e661725..3c91516c30 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -40,10 +40,10 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) - - + + @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2 shrink-0', 'unknown') -
{{ $index->title() }}
+
{{ $index->title() }}
{{ ucwords($index->config()['driver']) }} @@ -64,7 +64,7 @@
@foreach($index->config()['fields'] as $field) -
+
{{ $field }}
@endforeach From 679fa684f96ccf7e3c5dad0ee2ff6287bd18650e Mon Sep 17 00:00:00 2001 From: Philipp Daun Date: Tue, 26 Nov 2024 11:00:04 +0100 Subject: [PATCH 7/9] Use correct fallback icon Signed-off-by: Philipp Daun --- resources/views/utilities/search.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index 3c91516c30..03a1982e16 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -42,7 +42,7 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) - @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2 shrink-0', 'unknown') + @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2 shrink-0', 'search-drivers/unknown')
{{ $index->title() }}
From 5308960f0bde5d61c5f033937a1a74f8eff309ae Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 26 Nov 2024 14:50:41 -0500 Subject: [PATCH 8/9] more tweaks --- resources/svg/search-drivers/unknown.svg | 1 - resources/views/utilities/search.blade.php | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 resources/svg/search-drivers/unknown.svg diff --git a/resources/svg/search-drivers/unknown.svg b/resources/svg/search-drivers/unknown.svg deleted file mode 100644 index f6f100ad68..0000000000 --- a/resources/svg/search-drivers/unknown.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index 03a1982e16..22ee6bace7 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -41,20 +41,24 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) - - @cp_svg('search-drivers/' . $index->config()['driver'], 'w-6 h-6 rtl:ml-2 ltr:mr-2 shrink-0', 'search-drivers/unknown') -
{{ $index->title() }}
+ +
+ @cp_svg('search-drivers/' . $index->config()['driver'], 'flex w-6 h-6 rtl:ml-2 ltr:mr-2 -my-1 shrink-0', 'search-drivers/local') + {{ $index->title() }} +
{{ ucwords($index->config()['driver']) }} @if (is_string($index->config()['searchables'])) - {{ $index->config()['searchables'] }} - @else
+ {{ $index->config()['searchables'] }} +
+ @else +
@foreach($index->config()['searchables'] as $searchable) -
+
{{ $searchable }}
@endforeach @@ -62,9 +66,9 @@ @endif -
+
@foreach($index->config()['fields'] as $field) -
+
{{ $field }}
@endforeach @@ -74,7 +78,7 @@
@csrf - +
From fb54a6661d3d3319a92e713c864bcac64e400aa0 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 26 Nov 2024 14:54:22 -0500 Subject: [PATCH 9/9] wip --- resources/views/utilities/search.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php index 22ee6bace7..059f28154f 100644 --- a/resources/views/utilities/search.blade.php +++ b/resources/views/utilities/search.blade.php @@ -42,8 +42,8 @@ @foreach (\Statamic\Facades\Search::indexes() as $index) -
- @cp_svg('search-drivers/' . $index->config()['driver'], 'flex w-6 h-6 rtl:ml-2 ltr:mr-2 -my-1 shrink-0', 'search-drivers/local') +
+ @cp_svg('search-drivers/' . $index->config()['driver'], 'flex w-6 h-6 rtl:ml-2 ltr:mr-2 -mt-0.5 shrink-0', 'search-drivers/local') {{ $index->title() }}