beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[FIX] Favicon preview, locale setting fix, 500 error on server creation, installer issue(#903)

Browse source
This commit is contained in:
Dennis 2023-07-31 15:14:08 +02:00 committed by GitHub
parent c4b75bf760 90ebe1468d
commit f9a102509b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Settings/LocaleSettings.php
View file

@ -24,7 +24,7 @@ class LocaleSettings extends Settings
public static function getValidations()
{
return [
'available' => 'nullable|array',
'available' => 'array|required',
'clients_can_change' => 'nullable|string',
'datatables' => 'nullable|string',
'default' => 'required|in:' . implode(',', config('app.available_locales')),

2
public/install/forms.php
View file

@ -141,7 +141,7 @@ if (isset($_POST['checkSMTP'])) {
];
foreach ($values as $key => $value) {
$query = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '$value' WHERE `name` = '$key' AND `group` = mail";
$query = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '$value' WHERE `name` = '$key' AND `group` = 'mail'";
$db->query($query);
}

BIN
storage/app/public/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

3
themes/default/views/admin/settings/index.blade.php
View file

@ -120,6 +120,9 @@
<div class="row">
<div class="card ml-5" style="width: 18rem;">
<span class="h3 text-center">{{ __('FavIcon') }} </span>
<img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/controlpanel_logo.png') }}"
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
class="card-img-top" alt="...">
<div class="card-body">
</div>

4
themes/default/views/layouts/app.blade.php
View file

@ -7,14 +7,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="{{ $website_settings->seo_title }}" property="og:title">
<meta content="{{ $website_settings->seo_description }}" property="og:description">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<link rel="icon"
href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? \Illuminate\Support\Facades\Storage::disk('public')->url('favicon.ico') : asset('favicon.ico') }}"
href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico') }}"
type="image/x-icon">
<script src="{{ asset('js/app.js') }}" defer></script>

2
themes/default/views/servers/create.blade.php
View file

@ -38,7 +38,7 @@
@if (!$server_creation_enabled)
<div class="alert alert-warning p-2 m-2">
{{ __('The creation of new servers has been disabled for regular users, enable it again') }}
<a href="{{ route('admin.settings.system') }}">{{ __('here') }}</a>.
<a href="{{ route('admin.settings.index', "#Server") }}">{{ __('here') }}</a>.
</div>
@endif
@if ($productCount === 0 || $nodeCount === 0 || count($nests) === 0 || count($eggs) === 0)