diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php index ee338fcdf3..e2d3e73077 100644 --- a/public/main/exercise/exercise.class.php +++ b/public/main/exercise/exercise.class.php @@ -5659,19 +5659,19 @@ class Exercise '.get_lang('Overlapping areaping area').' '.get_lang('Minimum').' '.$threadhold1.' - ' + ' .$overlap.' '.get_lang('Excessive areaive area').' '.get_lang('max. 20 characters, e.g. INNOV21').' '.$threadhold2.' - ' + ' .$excess.' '.get_lang('Missing area area').' '.get_lang('max. 20 characters, e.g. INNOV21').' '.$threadhold3.' - ' + ' .$missing.' '; diff --git a/public/main/exercise/overview.php b/public/main/exercise/overview.php index c85f09eed6..fa600eba12 100644 --- a/public/main/exercise/overview.php +++ b/public/main/exercise/overview.php @@ -512,7 +512,7 @@ if ($quizCheckButtonEnabled) { btnTest.prop('disabled', true).removeClass('btn--success btn--danger').addClass('btn--plain'); iconBtnTest.removeClass('hidden'); - var txtResult = $('#quiz-check-request-text').removeClass('text-success text-danger').hide(); + var txtResult = $('#quiz-check-request-text').removeClass('text-success text-error').hide(); $ .when( @@ -537,11 +537,11 @@ if ($quizCheckButtonEnabled) { txtResult.text(\"".get_lang('QuizBrowserCheckOK')."\").addClass('text-success').show(); } else { btnTest.removeClass('btn--plain btn--success').addClass('btn--danger'); - txtResult.text(\"".get_lang('QuizBrowserCheckKO')."\").addClass('text-danger').show(); + txtResult.text(\"".get_lang('QuizBrowserCheckKO')."\").addClass('text-error').show(); } }, function () { - txtResult.text(\"".get_lang('QuizBrowserCheckKO')."\").addClass('text-danger').show(); + txtResult.text(\"".get_lang('QuizBrowserCheckKO')."\").addClass('text-error').show(); btnTest.removeClass('btn--plain btn--success').addClass('btn--danger'); } ) diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php index b62b99ec02..8b3a60a00e 100644 --- a/public/main/inc/lib/display.lib.php +++ b/public/main/inc/lib/display.lib.php @@ -916,7 +916,10 @@ class Display $html = ''; $extra = ''; $default_id = 'id="'.$name.'" '; - $extra_attributes = array_merge(['class' => 'form-control'], $extra_attributes); + $extra_attributes = array_merge( + ['class' => 'p-dropdown p-component p-inputwrapper p-inputwrapper-filled'], + $extra_attributes + ); foreach ($extra_attributes as $key => $parameter) { if ('id' == $key) { $default_id = ''; diff --git a/public/main/inc/lib/formvalidator/FormValidator.class.php b/public/main/inc/lib/formvalidator/FormValidator.class.php index 43aab02692..b2c4f8c1dd 100644 --- a/public/main/inc/lib/formvalidator/FormValidator.class.php +++ b/public/main/inc/lib/formvalidator/FormValidator.class.php @@ -119,7 +119,7 @@ EOT; { if (self::LAYOUT_BOX_SEARCH == $this->layout) { return '
-
+
{content} {hidden}
diff --git a/public/main/install/install.lib.php b/public/main/install/install.lib.php index f7a2c0fcb0..edf88cf49c 100644 --- a/public/main/install/install.lib.php +++ b/public/main/install/install.lib.php @@ -823,7 +823,7 @@ function display_requirements( if (count($notWritable) > 0) { error_log('Installer: At least one needed directory or file is not writeable'); $error = true; ?> -
+

', ''); ?> @@ -832,7 +832,7 @@ function display_requirements( '; foreach ($notWritable as $value) { - echo '

  • '.$value.'
  • '; + echo '
  • '.$value.'
  • '; } echo ''; } elseif (file_exists(api_get_path(CONFIGURATION_PATH).'configuration.php')) { @@ -858,11 +858,13 @@ function display_requirements( if (count($deprecatedToRemove) > 0) { ?> -

    +

    + newscorm and exercice directories were renamed to lp and exercise respectively, is necessary to delete or rename to newscorm_old and exercice_old."); ?> +

      -
    • +
    diff --git a/public/plugin/whispeakauth/WhispeakMyStudentsLpTrackingHook.php b/public/plugin/whispeakauth/WhispeakMyStudentsLpTrackingHook.php index 67dd85ad02..5a3e8cdc7a 100644 --- a/public/plugin/whispeakauth/WhispeakMyStudentsLpTrackingHook.php +++ b/public/plugin/whispeakauth/WhispeakMyStudentsLpTrackingHook.php @@ -49,7 +49,7 @@ class WhispeakMyStudentsLpTrackingHook extends HookObserver implements HookMyStu $successCount = WhispeakAuthPlugin::countSuccessAttemptsInLearningPath($data['lp_id'], $data['student_id']); $attrs = ['class' => 'text-center ']; - $attrs['class'] .= $successCount <= $totalCount / 2 ? 'text-danger' : 'text-success'; + $attrs['class'] .= $successCount <= $totalCount / 2 ? 'text-error' : 'text-success'; return [ 'value' => Display::tag('strong', "$successCount / $totalCount"), diff --git a/public/plugin/whispeakauth/WhispeakMyStudentsQuizTrackingHook.php b/public/plugin/whispeakauth/WhispeakMyStudentsQuizTrackingHook.php index 399ae88e47..d0e60ca549 100644 --- a/public/plugin/whispeakauth/WhispeakMyStudentsQuizTrackingHook.php +++ b/public/plugin/whispeakauth/WhispeakMyStudentsQuizTrackingHook.php @@ -67,7 +67,7 @@ class WhispeakMyStudentsQuizTrackingHook extends HookObserver implements HookMyS $successCount = WhispeakAuthPlugin::countSuccessAttemptsInQuiz($data['quiz_id'], $data['student_id']); $attrs = ['class' => 'text-center ']; - $attrs['class'] .= $successCount <= $totalCount / 2 ? 'text-danger' : 'text-success'; + $attrs['class'] .= $successCount <= $totalCount / 2 ? 'text-error' : 'text-success'; return [ 'value' => Display::tag('strong', "$successCount / $totalCount"),