From c34269aba0391d07f4747b4ddbb1a6469c901073 Mon Sep 17 00:00:00 2001 From: purple Date: Thu, 13 Jul 2023 21:27:05 +0200 Subject: [PATCH] Fix wrong variables for dashboard_wrapper and change placeholders in wrapper.blade.php --- blueprint.sh | 10 ++++++---- resources/views/templates/wrapper.blade.php | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/blueprint.sh b/blueprint.sh index 3b4d5ca..6b79396 100644 --- a/blueprint.sh +++ b/blueprint.sh @@ -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~~$ADMINBUTTON_RESULT\n~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 "" >> .blueprint/tmp/$n/$dashboard_header.bak; - sed "//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 "" >> .blueprint/tmp/$n/$dashboard_wrapper.bak; + sed "//r .blueprint/tmp/$n/$dashboard_wrapper.bak" resources/views/templates/wrapper.blade.php; fi; rm .blueprint/data/internal/build/extensions/admin.blade.php.bak; diff --git a/resources/views/templates/wrapper.blade.php b/resources/views/templates/wrapper.blade.php index 148bfb4..87833ba 100644 --- a/resources/views/templates/wrapper.blade.php +++ b/resources/views/templates/wrapper.blade.php @@ -1,7 +1,7 @@ - + {{ config('app.name', 'Pterodactyl') }} @section('meta') @@ -40,10 +40,10 @@ @yield('assets') @include('layouts.scripts') - + - + @section('content') @yield('above-container') @yield('container') @@ -52,6 +52,6 @@ @section('scripts') {!! $asset->js('main.js') !!} @show - + \ No newline at end of file