moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some formatting when clock is not displayed

Browse source 
Messages are now printed out on continue.php
This commit is contained in:
mark-nielsen 2006-09-09 22:33:34 +00:00
parent 2163c22634
commit 09e3b9d7eb
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/lesson/action/continue.html
View file

@ -34,7 +34,7 @@ if ($lesson->displayleft) {
} // End if ($lesson->displayleft) } // End if ($lesson->displayleft)
?> ?>
<!-- Start Primary column --> <!-- Start Primary column -->
<td> <td align="center" width="100%">
<?php if ($lesson->displayleft) { // Skip navigation anchor ?> <?php if ($lesson->displayleft) { // Skip navigation anchor ?>

14
mod/lesson/action/continue.php
View file

@ -4,8 +4,6 @@
confirm_sesskey(); confirm_sesskey();
$messages = array();
// left menu code // left menu code
// check to see if the user can see the left menu // check to see if the user can see the left menu
if (!has_capability('mod/lesson:manage', $context)) { if (!has_capability('mod/lesson:manage', $context)) {
@ -16,7 +14,7 @@
if(has_capability('mod/lesson:manage', $context) and lesson_display_teacher_warning($lesson->id)) { if(has_capability('mod/lesson:manage', $context) and lesson_display_teacher_warning($lesson->id)) {
$warningvars->cluster = get_string("clusterjump", "lesson"); $warningvars->cluster = get_string("clusterjump", "lesson");
$warningvars->unseen = get_string("unseenpageinbranch", "lesson"); $warningvars->unseen = get_string("unseenpageinbranch", "lesson");
$messages[] = get_string("teacherjumpwarning", "lesson", $warningvars); lesson_set_message(get_string("teacherjumpwarning", "lesson", $warningvars));
} }
// This is the code updates the lesson time for a timed test // This is the code updates the lesson time for a timed test
@ -31,9 +29,9 @@
if ($lesson->timed) { if ($lesson->timed) {
if ((($timer->starttime + $lesson->maxtime * 60) - time()) < 60 && !((($timer->starttime + $lesson->maxtime * 60) - time()) < 0)) { if ((($timer->starttime + $lesson->maxtime * 60) - time()) < 60 && !((($timer->starttime + $lesson->maxtime * 60) - time()) < 0)) {
$messages[] = get_string("studentoneminwarning", "lesson"); lesson_set_message(get_string("studentoneminwarning", "lesson"));
} else if (($timer->starttime + $lesson->maxtime * 60) < time()) { } else if (($timer->starttime + $lesson->maxtime * 60) < time()) {
$messages[] = get_string("studentoutoftime", "lesson"); lesson_set_message(get_string("studentoutoftime", "lesson"));
$outoftime = true; $outoftime = true;
} }
if ((($timer->starttime + $lesson->maxtime * 60) - time()) <= 0) { if ((($timer->starttime + $lesson->maxtime * 60) - time()) <= 0) {
@ -50,7 +48,7 @@
// Inform teacher that s/he will not see the timer // Inform teacher that s/he will not see the timer
if ($lesson->timed and has_capability('mod/lesson:manage', $context)) { if ($lesson->timed and has_capability('mod/lesson:manage', $context)) {
$messages[] = get_string("teachertimerwarning", "lesson"); lesson_set_message(get_string("teachertimerwarning", "lesson"));
} }
// record answer (if necessary) and show response (if none say if answer is correct or not) // record answer (if necessary) and show response (if none say if answer is correct or not)
@ -771,11 +769,11 @@
// Report attempts remaining // Report attempts remaining
if ($attemptsremaining != 0) { if ($attemptsremaining != 0) {
$messages[] = get_string('attemptsremaining', 'lesson', $attemptsremaining); lesson_set_message(get_string('attemptsremaining', 'lesson', $attemptsremaining));
} }
// Report if max attempts reached // Report if max attempts reached
if ($maxattemptsreached != 0) { if ($maxattemptsreached != 0) {
$messages[] = '('.get_string("maximumnumberofattemptsreached", "lesson").')'; lesson_set_message('('.get_string("maximumnumberofattemptsreached", "lesson").')');
} }
lesson_print_header($cm, $course, $lesson, 'navigation', false); lesson_print_header($cm, $course, $lesson, 'navigation', false);