]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ddda17)
wait #4513 @0.5
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 2 Jun 2021 18:29:48 +0000 (18:29 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 2 Jun 2021 18:29:48 +0000 (18:29 +0000)
inc/ws/Controlleur/class.ws.url.php patch | blob | history

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 39057021905bb735fcd6f543963200354f44bf3f..55826a78bab98a5e098da43ce7b4726f849a07d6 100644 (file)
--- 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 = '<html>';
         $res .= '<head>';
         $res .= '<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">';
@@ -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);
Unnamed repository; edit this file 'description' to name the repository.