From: vincent@cubedesigners.com Date: Wed, 2 Jun 2021 18:29:48 +0000 (+0000) Subject: wait #4513 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ff36c5e187fed27d28ebdd36e41fedfc64b68afb;p=cubeextranet.git wait #4513 @0.5 --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 390570219..55826a78b 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -756,7 +756,7 @@ class wsUrl public static function getTranslationSources() { - return array(__('Version HTML5') => WS_COMPILE_ASSETS . '/player/local', __('Compilateur HTML5') => ROOT . '/inc/ws/Util/html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'); + return array(__('Version HTML5') => WS_COMPILE_ASSETS . '/player/local', __('Version HTML5 GIT') => WS_COMPILE_ASSETS . '/player/branches', __('Compilateur HTML5') => ROOT . '/inc/ws/Util/html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'); } public static function exportLangAsExcel($args) @@ -1149,6 +1149,11 @@ html.tall{height:150%}' . "\n"; public static function loadingCompile($url, $book, $theme) { + + $tcolor = $theme->parametres->couleurL; + if ($tcolor == $theme->parametres->backgroundColor) { + $tcolor = $theme->parametres->loadingSecColor; + } $res = ''; $res .= ''; $res .= ''; @@ -1163,7 +1168,7 @@ html.tall{height:150%}' . "\n"; } *{margin:0;padding:0;} html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-color:#' . $theme->parametres->backgroundColor . ';}'; - $res .= 'h2,h3{text-align:center;color:#' . $theme->parametres->couleurL . ';font-weight:400;position:relative;top:55%;}'; + $res .= 'h2,h3{text-align:center;color:#' . $tcolor . ';font-weight:400;position:relative;top:55%;}'; $res .= 'h2{font-size:16px;}'; $res .= 'h3{font-size:10px;}'; $res .= 'svg{position:absolute;top:calc(50% - 24px);left:calc(50% - 24px);