From 9107b2a3abb11aec5ac9a13bc39abc34edb4a489 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 12 May 2020 16:28:12 +0000 Subject: [PATCH] wait #3637 @1.5 --- inc/ws/Metier/class.ws.book.parametres.php | 3 ++- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index dddeca664..8223d3c09 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -651,9 +651,10 @@ class wsBookParametres extends wsParametres $this->fields['scorm_quizdata'] = array('type' => 'freefile', 'editable' => true, 'default' => '', 'label' => __('Données de quiz')); $this->fields['scorm_complete_on_exit'] = ['type' => 'boolean', 'default' => false, 'label' => 'Marquer le cours comme "Complete" à la fermeture de la fenêtre', 'editable' => true]; $this->fields['scorm_complete_on_last_page'] = ['type' => 'boolean', 'default' => false, 'label' => 'Marquer le cours comme "Complete" lorsque le visiteur atteint la dernière page', 'editable' => true]; + $this->fields['scorm_force_attempts'] = ['type' => 'boolean', 'default' => false, 'label' => __('Forcer la création d\'un "attempt" à chaque ouverture'), 'editable' => true]; $this->forms['scorm'] = array('label' => __('SCORM'), - 'fieldsnames' => array('scorm_enable', 'scorm_version', 'scorm_id', 'scorm_org', 'scorm_title', 'scorm_variables', '|', 'scorm_complete_on_exit', 'scorm_complete_on_last_page', '|', 'scorm_quizdata', 'scorm_score', 'scorm_score_min', 'scorm_quiz_as_questionnaire')); + 'fieldsnames' => array('scorm_enable', 'scorm_version', 'scorm_id', 'scorm_org', 'scorm_title', 'scorm_variables', '|', 'scorm_complete_on_exit', 'scorm_complete_on_last_page', '|', 'scorm_quizdata', 'scorm_score', 'scorm_score_min', 'scorm_quiz_as_questionnaire', '|', 'scorm_force_attempts')); $this->fields['ongletsXML'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('XML de configuration des onglets'), 'grade' => 5); diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index 958a1e108..438bb93f1 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -936,9 +936,10 @@ class wsHTML5Compiler $splash = ''; $splashstyles = ''; - if ($this->book->parametres->splashImage) { - $this->vdir->copy($this->wdir . '/' . $this->book->parametres->splashImage, 'data/images/' . $this->book->parametres->splashImage); - $splashstyles = 'background-image:url(' . 'data/images/' . $this->book->parametres->splashImage . ');background-size:contain;background-position:50% 50%;'; + $img = $this->book->parametres->splashImage; + if ($img) { + $this->vdir->copy($this->wdir . '/' . $img, 'data/images/' . $img); + $splashstyles = 'background-image:url(' . 'data/images/' . $img . ');background-size:contain;background-position:50% 50%;'; if ($this->book->parametres->splashURL !== '') { $splash = ''; } -- 2.39.5