denis/peliprint
denis/peliprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix core views: Construct the admin view template correctly and attempt to fix extension button not being removed.

Browse source
This commit is contained in:
prplwtf 2024-03-16 14:42:29 +01:00
parent 3ce0f59ff0
commit 83dac2f8d5
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
blueprint.sh
View file

@ -491,7 +491,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
# Change link icon depending on website url.
websiteiconclass="bx-link-external"
websiteiconclass="bx bx-link-external"
# git
if [[ $website == *"://github.com/"* ]] || [[ $website == *"://www.github.com/"* ]] \
@ -1027,7 +1027,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
AdminRouteConstructor="$__BuildDir/extensions/route.php.bak"
AdminButtonConstructor="$__BuildDir/extensions/button.blade.php.bak"
ConfigExtensionFS="$__BuildDir/extensions/config/ExtensionFS.build.bak"
{
if [[ $controller_type == "default" ]]; then cp "$__BuildDir/extensions/controller.build" "$AdminControllerConstructor"; fi
cp "$__BuildDir/extensions/admin.blade.php" "$AdminBladeConstructor"
@ -1075,7 +1074,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
cp ".blueprint/tmp/$n/$icon" ".blueprint/extensions/$identifier/assets/icon.$ICON_EXT"
fi;
ICON="/assets/extensions/$identifier/icon.$ICON_EXT"
CONTENT=$(cat .blueprint/tmp/"$n"/"$admin_view")
if [[ $admin_css != "" ]]; then
PRINT INFO "Cloning and linking admin css.."
@ -1095,7 +1093,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
if [[ $name == *"~"* ]]; then PRINT WARNING "'name' contains '~' and may result in an error.";fi
if [[ $description == *"~"* ]]; then PRINT WARNING "'description' contains '~' and may result in an error.";fi
if [[ $version == *"~"* ]]; then PRINT WARNING "'version' contains '~' and may result in an error.";fi
if [[ $CONTENT == *"~"* ]]; then PRINT WARNING "'CONTENT' contains '~' and may result in an error.";fi
if [[ $ICON == *"~"* ]]; then PRINT WARNING "'ICON' contains '~' and may result in an error.";fi
if [[ $identifier == *"~"* ]]; then PRINT WARNING "'identifier' contains '~' and may result in an error.";fi
@ -1123,7 +1120,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
-e "s~\[webicon\]~$websiteiconclass~g" \
"$AdminBladeConstructor"
fi
echo -e "$CONTENT\n@endsection" >> "$AdminBladeConstructor"
echo -e "\n@endsection" >> "$AdminBladeConstructor"
# Construct admin route
sed -i "s~\[id\]~$identifier~g" "$AdminRouteConstructor"
@ -1174,7 +1171,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
else
# Replace old extensions page button if extension is updating.
OLDBUTTON_RESULT=$(<.blueprint/extensions/"$identifier"/private/.store/build/button.blade.php)
sed -i "s~$OLDBUTTON_RESULT~~g" "resources/views/admin/extensions.blade.php"
sed -i "s~\<\!--@$identifier:s\@--\>*\<\!--\@$identifier:e\@--\>~~g" "resources/views/admin/extensions.blade.php"
fi
sed -i "s~<!-- \[entryplaceholder\] -->~$ADMINBUTTON_RESULT\n<!-- \[entryplaceholder\] -->~g" "resources/views/admin/extensions.blade.php"

2
blueprint/extensions/blueprint/private/build/extensions/button.blade.php
View file

@ -1 +1 @@
@include("blueprint.admin.entry", ['EXTENSION_ID' => '[id]', 'EXTENSION_NAME' => '[name]', 'EXTENSION_VERSION' => '[version]', 'EXTENSION_ICON' => '[icon]'])
<!--@[id]:s@-->@include("blueprint.admin.entry", ['EXTENSION_ID' => '[id]', 'EXTENSION_NAME' => '[name]', 'EXTENSION_VERSION' => '[version]', 'EXTENSION_ICON' => '[icon]'])<!--@[id]:e@-->

2
resources/views/blueprint/admin/entry.blade.php
View file

@ -1,6 +1,6 @@
@if(isset($EXTENSION_ID))
<div class="col-lg-3 col-md-4 col-sm-6 col-xs-12 text-center">
<a href="{{ route('admin.extensions.'.$EXTENSION_ID) }}">
<a href="{{ route('admin.extensions.'.$EXTENSION_ID.'.index') }}">
<button class="btn extension-btn" style="width:100%;margin-bottom:17px;">
<img src="{{ $EXTENSION_ICON }}" alt="logo" class="extension-btn-image"><p class="extension-btn-text">{{ $EXTENSION_NAME }}</p>
<p class="extension-btn-version">{{ $EXTENSION_VERSION }}</p>

2
resources/views/blueprint/admin/template.blade.php
View file

@ -1,5 +1,5 @@
@section("extension.header")
<img src="{{ $EXTENSION_ID }}" alt="logo" style="float:left;width:30px;height:30px;border-radius:3px;margin-right:5px;"/>
<img src="{{ $EXTENSION_ICON }}" alt="logo" style="float:left;width:30px;height:30px;border-radius:3px;margin-right:5px;"/>
<button class="btn btn-gray-alt pull-right" style="padding: 5px 10px; margin-left: 7px" data-toggle="modal" data-target="#extensionConfigModal">
<i class="bx bx-slider"></i>