From 9e67b7c72ed361582378e12b37f7515813b2d0ed Mon Sep 17 00:00:00 2001 From: OllieJC Date: Tue, 18 Jan 2022 22:33:21 +0000 Subject: [PATCH 1/5] Add custom_css and custom_js advance settings --- database/seeds/SettingsSeeder.php | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/database/seeds/SettingsSeeder.php b/database/seeds/SettingsSeeder.php index 5941fbd5..e5e2cd0c 100644 --- a/database/seeds/SettingsSeeder.php +++ b/database/seeds/SettingsSeeder.php @@ -44,6 +44,16 @@ class SettingsSeeder extends Seeder $setting_group->title = 'app.settings.miscellaneous'; $setting_group->save(); } + if(!$setting_group = SettingGroup::find(4)) { + $setting_group = new SettingGroup; + $setting_group->id = 4; + $setting_group->title = 'app.settings.advanced'; + $setting_group->order = 3; + $setting_group->save(); + } else { + $setting_group->title = 'app.settings.advanced'; + $setting_group->save(); + } if($version = Setting::find(1)) { $version->label = 'app.settings.version'; @@ -194,6 +204,38 @@ class SettingsSeeder extends Seeder $setting->system = true; $setting->save(); } + + if(!$setting = Setting::find(10)) { + $setting = new Setting; + $setting->id = 10; + $setting->group_id = 4; + $setting->key = 'custom_css'; + $setting->type = 'textarea'; + $setting->label = 'app.settings.custom_css'; + $setting->value = ''; + $setting->save(); + } else { + $setting->type = 'textarea'; + $setting->group_id = 4; + $setting->label = 'app.settings.custom_css'; + $setting->save(); + } + + if(!$setting = Setting::find(11)) { + $setting = new Setting; + $setting->id = 11; + $setting->group_id = 4; + $setting->key = 'custom_js'; + $setting->type = 'textarea'; + $setting->label = 'app.settings.custom_js'; + $setting->value = ''; + $setting->save(); + } else { + $setting->type = 'textarea'; + $setting->group_id = 4; + $setting->label = 'app.settings.custom_js'; + $setting->save(); + } if(!$home_tag = \App\Item::find(0)) { $home_tag = new \App\Item; From 869cfd34abccc28a05ebabe02b8a1fb762e7b0dc Mon Sep 17 00:00:00 2001 From: OllieJC Date: Tue, 18 Jan 2022 22:40:09 +0000 Subject: [PATCH 2/5] Add custom CSS and JS options --- resources/views/layouts/app.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index c01f4c5d..75c3f850 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -33,6 +33,10 @@ @else @endif +
@@ -113,5 +117,9 @@ @yield('scripts') + From 862f870303a354ede73b90f44bfeefd98041bdb6 Mon Sep 17 00:00:00 2001 From: OllieJC Date: Tue, 18 Jan 2022 22:42:53 +0000 Subject: [PATCH 3/5] Add settings.advanced/custom_css/custom_js --- resources/lang/en/app.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 61296da5..2a2b9560 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -12,6 +12,8 @@ return [ 'settings.system' => 'System', 'settings.appearance' => 'Appearance', 'settings.miscellaneous' => 'Miscellaneous', + 'settings.advanced' => 'Advanced', + 'settings.support' => 'Support', 'settings.donate' => 'Donate', @@ -29,11 +31,13 @@ return [ 'settings.search' => 'search', 'settings.no_items' => 'No items found', - 'settings.label' => 'Label', 'settings.value' => 'Value', 'settings.edit' => 'Edit', 'settings.view' => 'View', + + 'settings.custom_css' => 'Custom CSS', + 'settings.custom_js' => 'Custom JavaScript', 'options.none' => '- not set -', 'options.google' => 'Google', From a4b32dcafd29543260b422acc8a485cedb50d4c2 Mon Sep 17 00:00:00 2001 From: OllieJC Date: Tue, 18 Jan 2022 22:59:40 +0000 Subject: [PATCH 4/5] Add textarea option --- app/Setting.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Setting.php b/app/Setting.php index e1f8bf40..2c6c2b26 100644 --- a/app/Setting.php +++ b/app/Setting.php @@ -126,6 +126,9 @@ class Setting extends Model } $value = Form::select('value', $options, null, ['class' => 'form-control']); break; + case 'textarea': + $value = Form::textarea('value', null, ['class' => 'form-control', 'cols' => '44', 'rows' => '15']); + break; default: $value = Form::text('value', null, ['class' => 'form-control']); break; From f51893b2d62fae366486f8b59218cc811800c95f Mon Sep 17 00:00:00 2001 From: OllieJC Date: Sat, 22 Jan 2022 13:30:50 +0000 Subject: [PATCH 5/5] Use pre for textarea settings --- resources/views/settings/list.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/settings/list.blade.php b/resources/views/settings/list.blade.php index 40561cfa..9a9d3e79 100644 --- a/resources/views/settings/list.blade.php +++ b/resources/views/settings/list.blade.php @@ -25,7 +25,11 @@ {{ __($setting->label) }} + @if($setting->type === "textarea") + 
{{ $setting->list_value }}
+ @else {!! $setting->list_value !!} + @endif @if((bool)$setting->system !== true) @@ -49,4 +53,4 @@ @endforeach -@endsection \ No newline at end of file +@endsection