Fix wrong variables for dashboard_wrapper and change placeholders in wrapper.blade.php

This commit is contained in:
purple 2023-07-13 21:27:05 +02:00
parent 6f8112dc1e
commit c34269aba0
2 changed files with 10 additions and 8 deletions

View file

@ -226,6 +226,8 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
admin_controller=$conf_admin_controller; #(optional)
admin_css=$conf_admin_css; #(optional)
dashboard_wrapper=$conf_dashboard_wrapper; #(optional)
data_directory=$conf_data_directory; #(optional)
data_public=$conf_data_public; #(optional)
@ -411,10 +413,10 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
sed -i "s~<!--␀replace␀-->~$ADMINBUTTON_RESULT\n<!--␀replace␀-->~g" resources/views/admin/extensions.blade.php;
# insert "dashboard_wrapper" into wrapper.blade.php
if [[ $dashboard_header != "" ]]; then
cp .blueprint/tmp/$n/$dashboard_header .blueprint/tmp/$n/$dashboard_header.bak;
echo "<!-- dashboard:header-bottom -->" >> .blueprint/tmp/$n/$dashboard_header.bak;
sed "/<!-- dashboard:header-bottom -->/r .blueprint/tmp/$n/$dashboard_header.bak" resources/views/templates/wrapper.blade.php;
if [[ $dashboard_wrapper != "" ]]; then
cp .blueprint/tmp/$n/$dashboard_wrapper .blueprint/tmp/$n/$dashboard_wrapper.bak;
echo "<!-- dashboard:header-bottom -->" >> .blueprint/tmp/$n/$dashboard_wrapper.bak;
sed "/<!-- dashboard:header-bottom -->/r .blueprint/tmp/$n/$dashboard_wrapper.bak" resources/views/templates/wrapper.blade.php;
fi;
rm .blueprint/data/internal/build/extensions/admin.blade.php.bak;

View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<!-- client:header-top -->
<!-- dashboard:header-top -->
<title>{{ config('app.name', 'Pterodactyl') }}</title>
@section('meta')
@ -40,10 +40,10 @@
@yield('assets')
@include('layouts.scripts')
<!-- client:header-bottom -->
<!-- dashboard:header-bottom -->
</head>
<body class="{{ $css['body'] ?? 'bg-neutral-50' }}">
<!-- client:body-top -->
<!-- dashboard:body-top -->
@section('content')
@yield('above-container')
@yield('container')
@ -52,6 +52,6 @@
@section('scripts')
{!! $asset->js('main.js') !!}
@show
<!-- client:body-bottom -->
<!-- dashboard:body-bottom -->
</body>
</html>