diff --git a/main/exercise/exercise.php b/main/exercise/exercise.php index 8b21b3837e..04654a0889 100644 --- a/main/exercise/exercise.php +++ b/main/exercise/exercise.php @@ -506,7 +506,7 @@ if ($is_allowedToEdit) { } } -if ($origin !== 'learnpath') { +if (!in_array($origin, ['learnpath', 'noheader'])) { //so we are not in learnpath tool Display::display_header($nameTools, get_lang('Exercise')); if (isset($_GET['message']) && in_array($_GET['message'], ['ExerciseEdited'])) { diff --git a/main/exercise/exercise_result.php b/main/exercise/exercise_result.php index 3759781d48..e9bdec0d9f 100755 --- a/main/exercise/exercise_result.php +++ b/main/exercise/exercise_result.php @@ -89,7 +89,7 @@ $pageTop = ''; $pageBottom = ''; $pageContent = ''; -if (!in_array($origin, ['learnpath', 'embeddable'])) { +if (!in_array($origin, ['learnpath', 'embeddable', 'noheader'])) { // So we are not in learnpath tool $showHeader = true; } @@ -240,7 +240,7 @@ ExerciseLib::exercise_time_control_delete( ExerciseLib::delete_chat_exercise_session($exe_id); -if (!in_array($origin, ['learnpath', 'embeddable'])) { +if (!in_array($origin, ['learnpath', 'embeddable', 'noheader'])) { $pageBottom .= '
'; $pageBottom .= Display::url( get_lang('ReturnToCourseHomepage'), @@ -254,7 +254,7 @@ if (!in_array($origin, ['learnpath', 'embeddable'])) { } $showFooter = true; -} elseif ($origin === 'embeddable') { +} elseif (in_array($origin, ['embeddable', 'noheader'])) { if (api_is_allowed_to_session_edit()) { Exercise::cleanSessionVariables(); } diff --git a/main/exercise/exercise_submit.php b/main/exercise/exercise_submit.php index 382d442532..ec788ae5b0 100755 --- a/main/exercise/exercise_submit.php +++ b/main/exercise/exercise_submit.php @@ -879,7 +879,7 @@ $interbreadcrumb[] = [ ]; $interbreadcrumb[] = ['url' => '#', 'name' => $objExercise->selectTitle(true)]; -if (!in_array($origin, ['learnpath', 'embeddable'])) { //so we are not in learnpath tool +if (!in_array($origin, ['learnpath', 'embeddable', 'noheader'])) { //so we are not in learnpath tool if (!api_is_allowed_to_session_edit()) { Display::addFlash( Display::return_message(get_lang('SessionIsReadOnly'), 'warning') @@ -892,6 +892,13 @@ if (!in_array($origin, ['learnpath', 'embeddable'])) { //so we are not in learnp echo '
 
'; } +if ($origin == 'noheader') { + echo '
'; + echo ''. + Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).''; + echo '
'; +} + $show_quiz_edition = $objExercise->added_in_lp(); // I'm in a preview mode diff --git a/main/exercise/overview.php b/main/exercise/overview.php index bfd0b4cd0f..4a7696075d 100755 --- a/main/exercise/overview.php +++ b/main/exercise/overview.php @@ -71,7 +71,7 @@ if ($time_control) { $htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left); } -if (!in_array($origin, ['learnpath', 'embeddable'])) { +if (!in_array($origin, ['learnpath', 'embeddable', 'noheader'])) { Display::display_header(); } else { $htmlHeadXtra[] = " @@ -82,6 +82,13 @@ if (!in_array($origin, ['learnpath', 'embeddable'])) { Display::display_reduced_header(); } +if ($origin == 'noheader') { + echo '
'; + echo ''. + Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).''; + echo '
'; +} + $html = ''; $message = ''; $html .= '
'; diff --git a/main/exercise/result.php b/main/exercise/result.php index 02045c503c..dbab16829b 100755 --- a/main/exercise/result.php +++ b/main/exercise/result.php @@ -15,7 +15,7 @@ $id = isset($_REQUEST['id']) ? (int) $_GET['id'] : 0; // exe id $show_headers = isset($_REQUEST['show_headers']) ? (int) $_REQUEST['show_headers'] : null; $origin = api_get_origin(); -if (in_array($origin, ['learnpath', 'embeddable'])) { +if (in_array($origin, ['learnpath', 'embeddable', 'noheader'])) { $show_headers = false; } @@ -77,6 +77,13 @@ if ($show_headers) { $htmlHeadXtra[] = ''; + + if ($origin == 'noheader') { + echo ''; + } } $message = Session::read('attempt_remaining'); diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index c2297d359d..1f41f01f6f 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -64,7 +64,11 @@ class Display ) { $origin = api_get_origin(); $showHeader = true; - if (isset($origin) && $origin == 'learnpath') { + if (isset($origin) && ($origin == 'learnpath' || $origin == 'noheader')) { + $showHeader = false; + } + + if (Session::read('origin') == 'noheader') { $showHeader = false; }