From: Vincent Vanwaelscappel Date: Tue, 2 May 2023 09:03:29 +0000 (+0200) Subject: wip #5902 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9b6dcf420ddeaea1a7a2f3e55173239e19e95260;p=fluidbook-toolbox.git wip #5902 @0.5 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPreviewOperation.php index e50e6cb66..c217f35c1 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPreviewOperation.php @@ -27,53 +27,32 @@ trait FluidbookPreviewOperation protected function _loadingCompile($theme, $title, $url) { - $bgcolor = Color::colorToCSS($theme->backgroundColor); - $scolor = Color::colorToCSS($theme->loadingSecColor); - $tcolor = $lcolor = Color::colorToCSS($theme->couleurL); - if ($tcolor == $bgcolor) { + $bgcolor = new Color($theme->backgroundColor); + $scolor = new Color($theme->loadingSecColor); + $tcolor = $lcolor = new Color($theme->couleurL); + + $tdist = $tcolor->distance($bgcolor); + $sdist = $scolor->distance($bgcolor); + + if ($tdist < 20000 && $sdist > $tdist) { $tcolor = $scolor; } $res = ''; $res .= ''; - $res .= ''; + $res .= ''; if (!request('shortLoading', false)) { $res .= ''; - $res .= ''; $res .= '' . $title . ''; $res .= ''; $res .= ''; - $res .= ' - - - - '; - + $res .= ''; $res .= '

' . __('Compilation du fluidbook en cours') . '...

'; $res .= '

' . __('Cette étape ne sera pas nécessaire lorsque le fluidbook sera installé sur son emplacement définitif') . '

'; } else {