]> git.mjollnir.org Git - moodle.git/commitdiff
Moved teacherview (lesson editing) out of view.php into edit.php
authormark-nielsen <mark-nielsen>
Sun, 10 Sep 2006 02:09:14 +0000 (02:09 +0000)
committermark-nielsen <mark-nielsen>
Sun, 10 Sep 2006 02:09:14 +0000 (02:09 +0000)
No code improvements in edit.php as of now.  Just works ;)

mod/lesson/action/addcluster.php
mod/lesson/action/addendofbranch.php
mod/lesson/action/addendofcluster.php
mod/lesson/action/delete.php
mod/lesson/action/insertpage.php
mod/lesson/action/moveit.php
mod/lesson/action/updatepage.php
mod/lesson/edit.php [new file with mode: 0644]
mod/lesson/locallib.php
mod/lesson/tabs.php
mod/lesson/view.php

index 2c4384025a9d8a58bb7d02a7f979add82ef123d3..ae547b4826e1e54bc6b6828d61e01f582a000569 100644 (file)
@@ -59,5 +59,5 @@
     if(!$newanswerid = insert_record("lesson_answers", $newanswer)) {
         error("Add cluster: answer record not inserted");
     }
-    redirect("view.php?id=$cm->id", get_string('addedcluster', 'lesson'));
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('addedcluster', 'lesson'));
 ?>
\ No newline at end of file
index 330413fc348d5649acb28bfe2851c3a6a970d1f5..bf72e4a6549f2f7e2a40e6471b70ef2f25500a63 100644 (file)
@@ -55,7 +55,7 @@
         if(!$newanswerid = insert_record("lesson_answers", $newanswer)) {
             error("Add end of branch: answer record not inserted");
         }
-        redirect("view.php?id=$cm->id", get_string('addedanendofbranch', 'lesson'));
+        redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('addedanendofbranch', 'lesson'));
     } else {
         notice(get_string("nobranchtablefound", "lesson"), "view.php?id=$cm->id");
     }
index 20b3bf00c5e5beb662810cd61986f76f3898a936..dd379c3420c28e1e1b904778736c9764aa468813 100644 (file)
@@ -46,4 +46,4 @@
     if(!$newanswerid = insert_record("lesson_answers", $newanswer)) {
         error("Add end of cluster: answer record not inserted");
     }
-    redirect("view.php?id=$cm->id", get_string('addedendofcluster', 'lesson'));
\ No newline at end of file
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('addedendofcluster', 'lesson'));
\ No newline at end of file
index 2e29da39ce1389e6ad0c6a62561138675c5f8324..18cd78f13a20a3c697fe45f1ecc71dff0390bdc7 100644 (file)
@@ -47,5 +47,5 @@
             error("Delete: unable to set prev link");
         }
     }
-    redirect("view.php?id=$cm->id", get_string('deletedpage', 'lesson'));
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('deletedpage', 'lesson'));
 ?>
index af9e2464bbc018aec081184716f2f3e774a5e1d1..0fb374e6fc59080dc75fad648ecaf28e69b49850 100644 (file)
@@ -6,7 +6,7 @@
 
     // check to see if the cancel button was pushed
     if (optional_param('cancel', '', PARAM_ALPHA)) {
-        redirect("view.php?id=$cm->id");
+        redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
     }
 
     $timenow = time();
         }
     }
 
-    redirect("view.php?id=$cm->id", get_string('insertedpage', 'lesson'));
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('insertedpage', 'lesson'));
 ?>
index 2eaf851725f42574ff84f345a18f5cc4b5b99914..32d9e73504d54f993342605f8059ae09d3751a7f 100644 (file)
@@ -92,5 +92,5 @@
     if (!set_field("lesson_pages", "nextpageid", 0, "id", $newlastpageid)) {
             error("Moveit: unable to update link");
     }
-    redirect("view.php?id=$cm->id", get_string('movedpage', 'lesson'));
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('movedpage', 'lesson'));
 ?>
index 2a7da3c58253f1bc8a5589f4fecb114e95f4952a..3bc8c59940d5be57472d0584e1ac8ac65b9d180f 100644 (file)
@@ -16,9 +16,9 @@
     if (optional_param('cancel', '', PARAM_ALPHA)) {
         if ($redirect == 'navigation') {
             // redirect to viewing the page
-            redirect("view.php?id=$cm->id&amp;action=navigation&amp;pageid=$page->id");
+            redirect("$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;action=navigation&amp;pageid=$page->id");
         } else {
-            redirect("view.php?id=$cm->id");
+            redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
         }
     }
 
     }
 
     if ($form->redisplay) {
-        redirect("lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id&amp;redirect=$redirect");
+        redirect("$CFG->wwwroot/mod/lesson/lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id&amp;redirect=$redirect");
     } else if ($redirect == 'navigation') {
         // takes us back to viewing the page
-        redirect("view.php?id=$cm->id&amp;action=navigation&amp;pageid=$page->id", get_string('updatedpage', 'lesson'));
+        redirect("$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;action=navigation&amp;pageid=$page->id", get_string('updatedpage', 'lesson'));
     } else {
-        redirect("view.php?id=$cm->id", get_string('updatedpage', 'lesson'));
+        redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('updatedpage', 'lesson'));
     }
 ?>
diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
new file mode 100644 (file)
index 0000000..1949797
--- /dev/null
@@ -0,0 +1,394 @@
+<?php  // $Id$
+/**
+ * Provides the interface for overall authoring of lessons
+ *
+ * @version $Id$
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package lesson
+ **/
+
+    require_once('../../config.php');
+    require_once('locallib.php');
+    require_once('lib.php');
+
+    $id      = required_param('id', PARAM_INT);             // Course Module ID
+    $display = optional_param('display', 0, PARAM_INT);
+    $mode    = optional_param('mode', get_user_preferences('lesson_view', 'collapsed'), PARAM_ALPHA);
+    
+    set_user_preference('lesson_view', $mode);
+    
+    // set collapsed flag
+    if ($mode == 'collapsed') {
+        $collapsed = true;
+    } else {
+        $collapsed = false;
+    }
+
+    list($cm, $course, $lesson) = lesson_get_basics($id);
+    
+    require_login($course->id, false, $cm);
+    
+    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    
+    require_capability('mod/lesson:manage');
+    
+    lesson_print_header($cm, $course, $lesson, $mode);
+    
+    // get number of pages
+    $npages = count_records('lesson_pages', 'lessonid', $lesson->id);
+
+    if (!$page = get_record_select("lesson_pages", "lessonid = $lesson->id AND prevpageid = 0")) {
+        // if there are no pages give teacher the option to create a new page or a new branch table
+        echo "<div align=\"center\">";
+        if (has_capability('mod/lesson:edit', $context)) {
+            print_simple_box( "<table cellpadding=\"5\" border=\"0\">\n<tr><th>".get_string("whatdofirst", "lesson")."</th></tr><tr><td>".
+                "<a href=\"import.php?id=$cm->id&amp;pageid=0\">".
+                get_string("importquestions", "lesson")."</a></td></tr><tr><td>".
+                "<a href=\"importppt.php?id=$cm->id&amp;pageid=0\">".
+                get_string("importppt", "lesson")."</a></td></tr><tr><td>".
+                "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=0&amp;firstpage=1\">".
+                get_string("addabranchtable", "lesson")."</a></td></tr><tr><td>".
+                "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=0&amp;firstpage=1\">".
+                get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
+                "</a></td></tr></table>\n");
+        }
+        echo '</div>';
+    } else {
+        // print the pages
+        echo "<form name=\"lessonpages\" method=\"post\" action=\"view.php\">\n";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+        echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
+        echo "<input type=\"hidden\" name=\"pageid\" />\n";
+        $branch = false;
+        $singlePage = false;
+        if($collapsed and !$display) {  
+            echo "<div align=\"center\">\n";
+                echo "<table><tr><td>\n";
+                lesson_print_tree($page->id, $lesson, $cm->id);
+                echo "</td></tr></table>\n";
+            echo "</div>\n";
+        } else {
+            if($display) {
+                while(true)
+                {
+                    if($page->id == $display && $page->qtype == LESSON_BRANCHTABLE) {
+                        $branch = true;
+                        $singlePage = false;
+                        break;
+                    } elseif($page->id == $display) {
+                        $branch = false;
+                        $singlePage = true;    
+                        break;
+                    } elseif ($page->nextpageid) {
+                        if (!$page = get_record("lesson_pages", "id", $page->nextpageid)) {
+                                error("Teacher view: Next page not found!");
+                        }
+                    } else {
+                        // last page reached
+                        break;
+                    }
+                }
+                echo "<table align=\"center\" cellpadding=\"5\" border=\"0\" width=\"80%\">\n";
+                if (has_capability('mod/lesson:edit', $context)) {
+                    echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=$page->prevpageid\">".
+                        get_string("importquestions", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=$page->prevpageid\">".
+                        get_string("addcluster", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofcluster&amp;pageid=$page->prevpageid\">".
+                        get_string("addendofcluster", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=$page->prevpageid\">".
+                        get_string("addabranchtable", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=$page->prevpageid\">".
+                        get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
+                        "</a></small></td></tr>\n";
+                }                  
+            } else {   
+                echo "<table align=\"center\" cellpadding=\"5\" border=\"0\" width=\"80%\">\n";
+                if (has_capability('mod/lesson:edit', $context)) {
+                    echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=0\">".
+                        get_string("importquestions", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=0\">".
+                        get_string("addcluster", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=0\">".
+                        get_string("addabranchtable", "lesson")."</a> | ".
+                        "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=0\">".
+                        get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
+                        "</a></small></td></tr>\n";
+                }
+            }
+            /// end collapsed code    (note, there is an "}" below for an else above)
+        while (true) {
+            echo "<tr><td>\n";
+            echo "<table width=\"100%\" border=\"1\" class=\"generalbox\"><tr><th colspan=\"2\">".format_string($page->title)."&nbsp;&nbsp;\n";
+            if (has_capability('mod/lesson:edit', $context)) {
+                if ($npages > 1) {
+                    echo "<a title=\"".get_string("move")."\" href=\"lesson.php?id=$cm->id&amp;action=move&amp;pageid=$page->id\">\n".
+                        "<img src=\"$CFG->pixpath/t/move.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"move\" /></a>\n";
+                }
+                echo "<a title=\"".get_string("update")."\" href=\"lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id\">\n".
+                    "<img src=\"$CFG->pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"edit\" /></a>\n".
+                    "<a title=\"".get_string("delete")."\" href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=confirmdelete&amp;pageid=$page->id\">\n".
+                    "<img src=\"$CFG->pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"delete\" /></a>\n";
+            }
+            echo "</th></tr>\n";             
+            echo "<tr><td colspan=\"2\">\n";
+            $options = new stdClass;
+            $options->noclean = true;
+            print_simple_box(format_text($page->contents, FORMAT_MOODLE, $options), "center");
+            echo "</td></tr>\n";
+            // get the answers in a set order, the id order
+            if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) {
+                echo "<tr><td colspan=\"2\" align=\"center\"><b>\n";
+                switch ($page->qtype) {
+                    case LESSON_ESSAY :
+                        echo $LESSON_QUESTION_TYPE[$page->qtype];
+                        break;
+                    case LESSON_SHORTANSWER :
+                        echo $LESSON_QUESTION_TYPE[$page->qtype];
+                        if ($page->qoption) {
+                            echo " - ".get_string("casesensitive", "lesson");
+                        }
+                        break;
+                    case LESSON_MULTICHOICE :
+                        echo $LESSON_QUESTION_TYPE[$page->qtype];
+                        if ($page->qoption) {
+                            echo " - ".get_string("multianswer", "lesson");
+                        }
+                        break;
+                    case LESSON_MATCHING :
+                        echo $LESSON_QUESTION_TYPE[$page->qtype];
+                        echo get_string("firstanswershould", "lesson");
+                        break;
+                    case LESSON_TRUEFALSE :
+                    case LESSON_NUMERICAL :
+                        echo $LESSON_QUESTION_TYPE[$page->qtype];
+                        break;
+                    case LESSON_BRANCHTABLE :    
+                        echo get_string("branchtable", "lesson");
+                        break;
+                    case LESSON_ENDOFBRANCH :
+                        echo get_string("endofbranch", "lesson");
+                        break;
+                    case LESSON_CLUSTER :
+                        echo get_string("clustertitle", "lesson");
+                        break;
+                    case LESSON_ENDOFCLUSTER :
+                        echo get_string("endofclustertitle", "lesson");
+                        break;
+                }
+                echo "</b></td></tr>\n";
+                $i = 1;
+                $n = 0;
+                foreach ($answers as $answer) {
+                    switch ($page->qtype) {
+                        case LESSON_MULTICHOICE:
+                        case LESSON_TRUEFALSE:
+                        case LESSON_SHORTANSWER:
+                        case LESSON_NUMERICAL:
+                            echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
+                            if ($lesson->custom) {
+                                // if the score is > 0, then it is correct
+                                if ($answer->score > 0) {
+                                    echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                } else {
+                                    echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                }
+                            } else {
+                                if (lesson_iscorrect($page->id, $answer->jumpto)) {
+                                    // underline correct answers
+                                    echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                } else {
+                                    echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                }
+                            }
+                            $options = new stdClass;
+                            $options->noclean = true;
+                            echo "</td><td width=\"80%\">\n";
+                            echo format_text($answer->answer, FORMAT_MOODLE, $options);
+                            echo "</td></tr>\n";
+                            echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("response", "lesson")." $i:</b> \n";
+                            echo "</td><td>\n";
+                            echo format_text($answer->response, FORMAT_MOODLE, $options); 
+                            echo "</td></tr>\n";
+                            break;                            
+                        case LESSON_MATCHING:
+                            $options = new stdClass;
+                            $options->noclean = true;
+                            if ($n < 2) {
+                                if ($answer->answer != NULL) {
+                                    if ($n == 0) {
+                                        echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("correctresponse", "lesson").":</b> \n";
+                                        echo "</td><td>\n";
+                                        echo format_text($answer->answer, FORMAT_MOODLE, $options); 
+                                        echo "</td></tr>\n";
+                                    } else {
+                                        echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("wrongresponse", "lesson").":</b> \n";
+                                        echo "</td><td>\n";
+                                        echo format_text($answer->answer, FORMAT_MOODLE, $options); 
+                                        echo "</td></tr>\n";
+                                    }
+                                }
+                                $n++;
+                                $i--;
+                            } else {
+                                echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
+                                if ($lesson->custom) {
+                                    // if the score is > 0, then it is correct
+                                    if ($answer->score > 0) {
+                                        echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                    } else {
+                                        echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                    }
+                                } else {
+                                    if (lesson_iscorrect($page->id, $answer->jumpto)) {
+                                        // underline correct answers
+                                        echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                    } else {
+                                        echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                    }
+                                }
+                                echo "</td><td width=\"80%\">\n";
+                                echo format_text($answer->answer, FORMAT_MOODLE, $options);
+                                echo "</td></tr>\n";
+                               echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("matchesanswer", "lesson")." $i:</b> \n";
+                                echo "</td><td>\n";
+                                echo format_text($answer->response, FORMAT_MOODLE, $options); 
+                                echo "</td></tr>\n";
+                            }
+                            break;
+                        case LESSON_BRANCHTABLE:
+                            $options = new stdClass;
+                            $options->noclean = true;
+                            echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
+                            echo "<b>".get_string("description", "lesson")." $i:</b> \n";
+                            echo "</td><td width=\"80%\">\n";
+                            echo format_text($answer->answer, FORMAT_MOODLE, $options);
+                            echo "</td></tr>\n";
+                            break;
+                    }
+                    if ($answer->jumpto == 0) {
+                        $jumptitle = get_string("thispage", "lesson");
+                    } elseif ($answer->jumpto == LESSON_NEXTPAGE) {
+                        $jumptitle = get_string("nextpage", "lesson");
+                    } elseif ($answer->jumpto == LESSON_EOL) {
+                        $jumptitle = get_string("endoflesson", "lesson");
+                    } elseif ($answer->jumpto == LESSON_UNSEENBRANCHPAGE) {
+                        $jumptitle = get_string("unseenpageinbranch", "lesson");
+                    } elseif ($answer->jumpto == LESSON_PREVIOUSPAGE) {
+                        $jumptitle = get_string("previouspage", "lesson");
+                    } elseif ($answer->jumpto == LESSON_RANDOMPAGE) {
+                        $jumptitle = get_string("randompageinbranch", "lesson");
+                    } elseif ($answer->jumpto == LESSON_RANDOMBRANCH) {
+                        $jumptitle = get_string("randombranch", "lesson");
+                    } elseif ($answer->jumpto == LESSON_CLUSTERJUMP) {
+                        $jumptitle = get_string("clusterjump", "lesson");
+                    } else {
+                        if (!$jumptitle = get_field("lesson_pages", "title", "id", $answer->jumpto)) {
+                            $jumptitle = "<b>".get_string("notdefined", "lesson")."</b>";
+                        }
+                    }
+                    $jumptitle = format_string($jumptitle,true);
+                    if ($page->qtype == LESSON_MATCHING) {
+                        if ($i == 1) {
+                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerscore", "lesson").":";
+                            echo "</b></td><td width=\"80%\">\n";
+                            echo "$answer->score</td></tr>\n";
+                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerjump", "lesson").":";
+                            echo "</b></td><td width=\"80%\">\n";
+                            echo "$jumptitle</td></tr>\n";
+                        } elseif ($i == 2) {
+                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerscore", "lesson").":";
+                            echo "</b></td><td width=\"80%\">\n";
+                            echo "$answer->score</td></tr>\n";
+                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerjump", "lesson").":";
+                            echo "</b></td><td width=\"80%\">\n";
+                            echo "$jumptitle</td></tr>\n";
+                        }
+                    } else {
+                        if ($lesson->custom and 
+                            $page->qtype != LESSON_BRANCHTABLE and 
+                            $page->qtype != LESSON_ENDOFBRANCH and
+                            $page->qtype != LESSON_CLUSTER and 
+                            $page->qtype != LESSON_ENDOFCLUSTER) {
+                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("score", "lesson")." $i:";
+                            echo "</b></td><td width=\"80%\">\n";
+                            echo "$answer->score</td></tr>\n";
+                        }
+                        echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("jump", "lesson")." $i:";
+                        echo "</b></td><td width=\"80%\">\n";
+                        echo "$jumptitle</td></tr>\n";
+                    }
+                    $i++;
+                }
+                // print_simple_box_end();  // not sure if i commented this out... hehe
+                echo "<tr><td colspan=\"2\" align=\"center\">";
+                if ($page->qtype != LESSON_ENDOFBRANCH) {
+                    echo "<input type=\"button\" value=\"";
+                    if ($page->qtype == LESSON_BRANCHTABLE) {
+                        echo get_string("checkbranchtable", "lesson");
+                    } else {
+                        echo get_string("checkquestion", "lesson");
+                    }
+                    echo "\" onclick=\"document.lessonpages.pageid.value=$page->id;".
+                        "document.lessonpages.submit();\" />";
+                }
+                echo "&nbsp;</td></tr>\n";
+            }
+            echo "</table></td></tr>\n";
+            if (has_capability('mod/lesson:edit', $context)) {
+                echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=$page->id\">".
+                    get_string("importquestions", "lesson")."</a> | ".    
+                     "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=$page->id\">".
+                     get_string("addcluster", "lesson")."</a> | ".
+                     "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofcluster&amp;pageid=$page->id\">".
+                     get_string("addendofcluster", "lesson")."</a> | ".
+                     "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=$page->id\">".
+                    get_string("addabranchtable", "lesson")."</a><br />";
+                // the current page or the next page is an end of branch don't show EOB link
+                $nextqtype = 0; // set to anything else EOB
+                if ($page->nextpageid) {
+                    $nextqtype = get_field("lesson_pages", "qtype", "id", $page->nextpageid);
+                }
+                if (($page->qtype != LESSON_ENDOFBRANCH) and ($nextqtype != LESSON_ENDOFBRANCH)) {
+                    echo "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofbranch&amp;pageid=$page->id\">".
+                    get_string("addanendofbranch", "lesson")."</a> | ";
+                }
+                echo "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=$page->id\">".
+                    get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
+                    "</a></small></td></tr>\n";
+            }
+//                echo "<tr><td>\n";
+            // check the prev links - fix (silently) if necessary - there was a bug in
+            // versions 1 and 2 when add new pages. Not serious then as the backwards
+            // links were not used in those versions
+            if (isset($prevpageid)) {
+                if ($page->prevpageid != $prevpageid) {
+                    // fix it
+                    set_field("lesson_pages", "prevpageid", $prevpageid, "id", $page->id);
+                    if ($CFG->debug) {
+                        echo "<p>***prevpageid of page $page->id set to $prevpageid***";
+                    }
+                }
+            }
+            $prevpageid = $page->id;
+            // move to next page
+            if($singlePage) {  // this will make sure only one page is displayed if needed
+                break;
+            } elseif($branch && $page->qtype == LESSON_ENDOFBRANCH) {  // this will display a branch table and its contents
+                break;
+            } elseif ($page->nextpageid) {
+                if (!$page = get_record("lesson_pages", "id", $page->nextpageid)) {
+                    error("Teacher view: Next page not found!");
+                }
+            } else {
+                // last page reached
+                break;
+            }
+        }
+    } // end of else from above collapsed code!!!
+
+        echo "</table></form>\n";
+    } 
+
+    print_footer($course);
+?>
\ No newline at end of file
index aa75be66d1351f5b1b03d996bf5aa274ed604c0f..78f89523dc8d4060e62e57fd4ec9511dbb0dc9ac 100644 (file)
@@ -1352,9 +1352,9 @@ function lesson_print_tree($pageid, $lesson, $cmid) {
     while ($pageid != 0) {
         echo "<tr><td>";
         if(($pages[$pageid]->qtype != LESSON_BRANCHTABLE) && ($pages[$pageid]->qtype != LESSON_ENDOFBRANCH)) {
-            $output = "<a style='color:#DF041E;' href=\"view.php?id=$cmid&display=".$pages[$pageid]->id."\">".format_string($pages[$pageid]->title,true)."</a>\n";
+            $output = "<a style='color:#DF041E;' href=\"$CFG->wwwroot/mod/lesson/edit.php?id=$cmid&display=".$pages[$pageid]->id."\">".format_string($pages[$pageid]->title,true)."</a>\n";
         } else {
-            $output = "<a href=\"view.php?id=$cmid&display=".$pages[$pageid]->id."\">".format_string($pages[$pageid]->title,true)."</a>\n";
+            $output = "<a href=\"$CFG->wwwroot/mod/lesson/edit.php?id=$cmid&display=".$pages[$pageid]->id."\">".format_string($pages[$pageid]->title,true)."</a>\n";
             
             if($answers = get_records_select("lesson_answers", "lessonid = $lesson->id and pageid = $pageid")) {
                 $output .= "Jumps to: ";
index 6a5c09ea099688ed4d3cf98afeaa98d45393fbc5..b1cf2f1aee4b8abc0f0e7e5796737c06b14350ba 100644 (file)
@@ -36,7 +36,7 @@
     $counts->student  = $course->student;
 
 
-    $row[] = new tabobject('teacherview', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id", get_string('edit'), get_string('editlesson', 'lesson', format_string($lesson->name)));
+    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('edit'), get_string('editlesson', 'lesson', format_string($lesson->name)));
     $row[] = new tabobject('navigation', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;action=navigation", get_string('preview', 'lesson'), get_string('previewlesson', 'lesson', format_string($lesson->name)));
     $row[] = new tabobject('reports', "$CFG->wwwroot/mod/lesson/report.php?id=$cm->id", get_string('reports', 'lesson'), get_string('viewreports', 'lesson', $counts));
     if (has_capability('mod/lesson:edit', $context)) {
 
     $tabs[] = $row;
 
-/// sub tabs for reports (overview and detail)
+
     switch ($currenttab) {
         case 'reportoverview':
         case 'reportdetail':
+        /// sub tabs for reports (overview and detail)
             $inactive[] = 'reports';
 
             $row    = array();
             $row[]  = new tabobject('reportdetail', "$CFG->wwwroot/mod/lesson/report.php?id=$cm->id&amp;action=reportdetail", get_string('detailedstats', 'lesson'));
             $tabs[] = $row;
             break;
-    }
-    
-/// sub tabs for teacher view (collapsed and expanded aka full)
-    if ($currenttab == 'teacherview') {
-        // use user preferences to remember which edit mode the user has selected
-        if (empty($mode)) {
-            $mode = get_user_preferences('lesson_view', 'collapsed');
-        } else {
-            set_user_preference('lesson_view', $mode);
-        }
-        
-        $inactive[] = 'teacherview';
-        $currenttab = $mode;
-        
-        $row    = array();
-        $row[]  = new tabobject('collapsed', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;action=teacherview&amp;mode=collapsed", get_string('collapsed', 'lesson'));
-        $row[]  = new tabobject('full', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp=teacherview&amp;mode=full", get_string('full', 'lesson'));
-        $tabs[] = $row;
+        case 'collapsed':
+        case 'full':
+        /// sub tabs for edit view (collapsed and expanded aka full)
+            $inactive[] = 'edit';
+            
+            $row    = array();
+            $row[]  = new tabobject('collapsed', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&amp;mode=collapsed", get_string('collapsed', 'lesson'));
+            $row[]  = new tabobject('full', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&amp;mode=full", get_string('full', 'lesson'));
+            $tabs[] = $row;
+            break;
     }
 
     print_tabs($tabs, $currenttab, $inactive);
index 701f4a3a5f45f87f805397b88915f408f7e030cb..1492db51f189e073033b8179cbe2d52e4b196bab 100644 (file)
@@ -10,8 +10,7 @@
     $id      = required_param('id', PARAM_INT);             // Course Module ID
     $pageid  = optional_param('pageid', NULL, PARAM_INT);   // Lesson Page ID
     $action  = optional_param('action', '', PARAM_ALPHA);
-    $display = optional_param('display', 0, PARAM_INT);     // for teacherview action
-    $mode    = optional_param('mode', '', PARAM_ALPHA);     // for eacherview action todo use user pref
+    
     
 
     if (! $cm = get_coursemodule_from_id('lesson', $id)) {
@@ -45,7 +44,7 @@
     // moved the action up because I needed to know what the action will be before the header is printed
     if (empty($action)) {
         if (has_capability('mod/lesson:manage', $context)) {
-            $action = 'teacherview';
+            redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
         } elseif  (time() < $lesson->available) {
             print_header($course->shortname .': '. format_string($lesson->name), $course->fullname,
                          $navigation .'<a href="index.php?id='. $course->id .'">'. $strlessons .'</a> -> '.
         } 
     }
 
-
-    /*******************teacher view **************************************/
-    elseif ($action == 'teacherview') {
-        // set collapsed flag
-        if ($mode == 'collapsed') {
-            $collapsed = true;
-        } else {
-            $collapsed = false;
-        }
-
-        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");   
-
-        // get number of pages
-        $npages = count_records('lesson_pages', 'lessonid', $lesson->id);
-
-        if (!$page = get_record_select("lesson_pages", "lessonid = $lesson->id AND prevpageid = 0")) {
-            // if there are no pages give teacher the option to create a new page or a new branch table
-            echo "<div align=\"center\">";
-            if (has_capability('mod/lesson:edit', $context)) {
-                print_simple_box( "<table cellpadding=\"5\" border=\"0\">\n<tr><th>".get_string("whatdofirst", "lesson")."</th></tr><tr><td>".
-                    "<a href=\"import.php?id=$cm->id&amp;pageid=0\">".
-                    get_string("importquestions", "lesson")."</a></td></tr><tr><td>".
-                    "<a href=\"importppt.php?id=$cm->id&amp;pageid=0\">".
-                    get_string("importppt", "lesson")."</a></td></tr><tr><td>".
-                    "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=0&amp;firstpage=1\">".
-                    get_string("addabranchtable", "lesson")."</a></td></tr><tr><td>".
-                    "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=0&amp;firstpage=1\">".
-                    get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
-                    "</a></td></tr></table>\n");
-            }
-            echo '</div>';
-        } else {
-            // print the pages
-            echo "<form name=\"lessonpages\" method=\"post\" action=\"view.php\">\n";
-            echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
-            echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
-            echo "<input type=\"hidden\" name=\"pageid\" />\n";
-            $branch = false;
-            $singlePage = false;
-            if($collapsed and !$display) {  
-                echo "<div align=\"center\">\n";
-                    echo "<table><tr><td>\n";
-                    lesson_print_tree($page->id, $lesson, $cm->id);
-                    echo "</td></tr></table>\n";
-                echo "</div>\n";
-            } else {
-                if($display) {
-                    while(true)
-                    {
-                        if($page->id == $display && $page->qtype == LESSON_BRANCHTABLE) {
-                            $branch = true;
-                            $singlePage = false;
-                            break;
-                        } elseif($page->id == $display) {
-                            $branch = false;
-                            $singlePage = true;    
-                            break;
-                        } elseif ($page->nextpageid) {
-                            if (!$page = get_record("lesson_pages", "id", $page->nextpageid)) {
-                                    error("Teacher view: Next page not found!");
-                            }
-                        } else {
-                            // last page reached
-                            break;
-                        }
-                    }
-                    echo "<table align=\"center\" cellpadding=\"5\" border=\"0\" width=\"80%\">\n";
-                    if (has_capability('mod/lesson:edit', $context)) {
-                        echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=$page->prevpageid\">".
-                            get_string("importquestions", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=$page->prevpageid\">".
-                            get_string("addcluster", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofcluster&amp;pageid=$page->prevpageid\">".
-                            get_string("addendofcluster", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=$page->prevpageid\">".
-                            get_string("addabranchtable", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=$page->prevpageid\">".
-                            get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
-                            "</a></small></td></tr>\n";
-                    }                  
-                } else {   
-                    echo "<table align=\"center\" cellpadding=\"5\" border=\"0\" width=\"80%\">\n";
-                    if (has_capability('mod/lesson:edit', $context)) {
-                        echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=0\">".
-                            get_string("importquestions", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=0\">".
-                            get_string("addcluster", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=0\">".
-                            get_string("addabranchtable", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=0\">".
-                            get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
-                            "</a></small></td></tr>\n";
-                    }
-                }
-                /// end collapsed code    (note, there is an "}" below for an else above)
-            while (true) {
-                echo "<tr><td>\n";
-                echo "<table width=\"100%\" border=\"1\" class=\"generalbox\"><tr><th colspan=\"2\">".format_string($page->title)."&nbsp;&nbsp;\n";
-                if (has_capability('mod/lesson:edit', $context)) {
-                    if ($npages > 1) {
-                        echo "<a title=\"".get_string("move")."\" href=\"lesson.php?id=$cm->id&amp;action=move&amp;pageid=$page->id\">\n".
-                            "<img src=\"$CFG->pixpath/t/move.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"move\" /></a>\n";
-                    }
-                    echo "<a title=\"".get_string("update")."\" href=\"lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id\">\n".
-                        "<img src=\"$CFG->pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"edit\" /></a>\n".
-                        "<a title=\"".get_string("delete")."\" href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=confirmdelete&amp;pageid=$page->id\">\n".
-                        "<img src=\"$CFG->pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"delete\" /></a>\n";
-                }
-                echo "</th></tr>\n";             
-                echo "<tr><td colspan=\"2\">\n";
-                $options = new stdClass;
-                $options->noclean = true;
-                print_simple_box(format_text($page->contents, FORMAT_MOODLE, $options), "center");
-                echo "</td></tr>\n";
-                // get the answers in a set order, the id order
-                if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) {
-                    echo "<tr><td colspan=\"2\" align=\"center\"><b>\n";
-                    switch ($page->qtype) {
-                        case LESSON_ESSAY :
-                            echo $LESSON_QUESTION_TYPE[$page->qtype];
-                            break;
-                        case LESSON_SHORTANSWER :
-                            echo $LESSON_QUESTION_TYPE[$page->qtype];
-                            if ($page->qoption) {
-                                echo " - ".get_string("casesensitive", "lesson");
-                            }
-                            break;
-                        case LESSON_MULTICHOICE :
-                            echo $LESSON_QUESTION_TYPE[$page->qtype];
-                            if ($page->qoption) {
-                                echo " - ".get_string("multianswer", "lesson");
-                            }
-                            break;
-                        case LESSON_MATCHING :
-                            echo $LESSON_QUESTION_TYPE[$page->qtype];
-                            echo get_string("firstanswershould", "lesson");
-                            break;
-                        case LESSON_TRUEFALSE :
-                        case LESSON_NUMERICAL :
-                            echo $LESSON_QUESTION_TYPE[$page->qtype];
-                            break;
-                        case LESSON_BRANCHTABLE :    
-                            echo get_string("branchtable", "lesson");
-                            break;
-                        case LESSON_ENDOFBRANCH :
-                            echo get_string("endofbranch", "lesson");
-                            break;
-                        case LESSON_CLUSTER :
-                            echo get_string("clustertitle", "lesson");
-                            break;
-                        case LESSON_ENDOFCLUSTER :
-                            echo get_string("endofclustertitle", "lesson");
-                            break;
-                    }
-                    echo "</b></td></tr>\n";
-                    $i = 1;
-                    $n = 0;
-                    foreach ($answers as $answer) {
-                        switch ($page->qtype) {
-                            case LESSON_MULTICHOICE:
-                            case LESSON_TRUEFALSE:
-                            case LESSON_SHORTANSWER:
-                            case LESSON_NUMERICAL:
-                                echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
-                                if ($lesson->custom) {
-                                    // if the score is > 0, then it is correct
-                                    if ($answer->score > 0) {
-                                        echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
-                                    } else {
-                                        echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
-                                    }
-                                } else {
-                                    if (lesson_iscorrect($page->id, $answer->jumpto)) {
-                                        // underline correct answers
-                                        echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
-                                    } else {
-                                        echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
-                                    }
-                                }
-                                $options = new stdClass;
-                                $options->noclean = true;
-                                echo "</td><td width=\"80%\">\n";
-                                echo format_text($answer->answer, FORMAT_MOODLE, $options);
-                                echo "</td></tr>\n";
-                                echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("response", "lesson")." $i:</b> \n";
-                                echo "</td><td>\n";
-                                echo format_text($answer->response, FORMAT_MOODLE, $options); 
-                                echo "</td></tr>\n";
-                                break;                            
-                            case LESSON_MATCHING:
-                                $options = new stdClass;
-                                $options->noclean = true;
-                                if ($n < 2) {
-                                    if ($answer->answer != NULL) {
-                                        if ($n == 0) {
-                                            echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("correctresponse", "lesson").":</b> \n";
-                                            echo "</td><td>\n";
-                                            echo format_text($answer->answer, FORMAT_MOODLE, $options); 
-                                            echo "</td></tr>\n";
-                                        } else {
-                                            echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("wrongresponse", "lesson").":</b> \n";
-                                            echo "</td><td>\n";
-                                            echo format_text($answer->answer, FORMAT_MOODLE, $options); 
-                                            echo "</td></tr>\n";
-                                        }
-                                    }
-                                    $n++;
-                                    $i--;
-                                } else {
-                                    echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
-                                    if ($lesson->custom) {
-                                        // if the score is > 0, then it is correct
-                                        if ($answer->score > 0) {
-                                            echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
-                                        } else {
-                                            echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
-                                        }
-                                    } else {
-                                        if (lesson_iscorrect($page->id, $answer->jumpto)) {
-                                            // underline correct answers
-                                            echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
-                                        } else {
-                                            echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
-                                        }
-                                    }
-                                    echo "</td><td width=\"80%\">\n";
-                                    echo format_text($answer->answer, FORMAT_MOODLE, $options);
-                                    echo "</td></tr>\n";
-                                   echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("matchesanswer", "lesson")." $i:</b> \n";
-                                    echo "</td><td>\n";
-                                    echo format_text($answer->response, FORMAT_MOODLE, $options); 
-                                    echo "</td></tr>\n";
-                                }
-                                break;
-                            case LESSON_BRANCHTABLE:
-                                $options = new stdClass;
-                                $options->noclean = true;
-                                echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
-                                echo "<b>".get_string("description", "lesson")." $i:</b> \n";
-                                echo "</td><td width=\"80%\">\n";
-                                echo format_text($answer->answer, FORMAT_MOODLE, $options);
-                                echo "</td></tr>\n";
-                                break;
-                        }
-                        if ($answer->jumpto == 0) {
-                            $jumptitle = get_string("thispage", "lesson");
-                        } elseif ($answer->jumpto == LESSON_NEXTPAGE) {
-                            $jumptitle = get_string("nextpage", "lesson");
-                        } elseif ($answer->jumpto == LESSON_EOL) {
-                            $jumptitle = get_string("endoflesson", "lesson");
-                        } elseif ($answer->jumpto == LESSON_UNSEENBRANCHPAGE) {
-                            $jumptitle = get_string("unseenpageinbranch", "lesson");
-                        } elseif ($answer->jumpto == LESSON_PREVIOUSPAGE) {
-                            $jumptitle = get_string("previouspage", "lesson");
-                        } elseif ($answer->jumpto == LESSON_RANDOMPAGE) {
-                            $jumptitle = get_string("randompageinbranch", "lesson");
-                        } elseif ($answer->jumpto == LESSON_RANDOMBRANCH) {
-                            $jumptitle = get_string("randombranch", "lesson");
-                        } elseif ($answer->jumpto == LESSON_CLUSTERJUMP) {
-                            $jumptitle = get_string("clusterjump", "lesson");
-                        } else {
-                            if (!$jumptitle = get_field("lesson_pages", "title", "id", $answer->jumpto)) {
-                                $jumptitle = "<b>".get_string("notdefined", "lesson")."</b>";
-                            }
-                        }
-                        $jumptitle = format_string($jumptitle,true);
-                        if ($page->qtype == LESSON_MATCHING) {
-                            if ($i == 1) {
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerscore", "lesson").":";
-                                echo "</b></td><td width=\"80%\">\n";
-                                echo "$answer->score</td></tr>\n";
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerjump", "lesson").":";
-                                echo "</b></td><td width=\"80%\">\n";
-                                echo "$jumptitle</td></tr>\n";
-                            } elseif ($i == 2) {
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerscore", "lesson").":";
-                                echo "</b></td><td width=\"80%\">\n";
-                                echo "$answer->score</td></tr>\n";
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerjump", "lesson").":";
-                                echo "</b></td><td width=\"80%\">\n";
-                                echo "$jumptitle</td></tr>\n";
-                            }
-                        } else {
-                            if ($lesson->custom and 
-                                $page->qtype != LESSON_BRANCHTABLE and 
-                                $page->qtype != LESSON_ENDOFBRANCH and
-                                $page->qtype != LESSON_CLUSTER and 
-                                $page->qtype != LESSON_ENDOFCLUSTER) {
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("score", "lesson")." $i:";
-                                echo "</b></td><td width=\"80%\">\n";
-                                echo "$answer->score</td></tr>\n";
-                            }
-                            echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("jump", "lesson")." $i:";
-                            echo "</b></td><td width=\"80%\">\n";
-                            echo "$jumptitle</td></tr>\n";
-                        }
-                        $i++;
-                    }
-                    // print_simple_box_end();  // not sure if i commented this out... hehe
-                    echo "<tr><td colspan=\"2\" align=\"center\">";
-                    if ($page->qtype != LESSON_ENDOFBRANCH) {
-                        echo "<input type=\"button\" value=\"";
-                        if ($page->qtype == LESSON_BRANCHTABLE) {
-                            echo get_string("checkbranchtable", "lesson");
-                        } else {
-                            echo get_string("checkquestion", "lesson");
-                        }
-                        echo "\" onclick=\"document.lessonpages.pageid.value=$page->id;".
-                            "document.lessonpages.submit();\" />";
-                    }
-                    echo "&nbsp;</td></tr>\n";
-                }
-                echo "</table></td></tr>\n";
-                if (has_capability('mod/lesson:edit', $context)) {
-                    echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=$page->id\">".
-                        get_string("importquestions", "lesson")."</a> | ".    
-                         "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addcluster&amp;pageid=$page->id\">".
-                         get_string("addcluster", "lesson")."</a> | ".
-                         "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofcluster&amp;pageid=$page->id\">".
-                         get_string("addendofcluster", "lesson")."</a> | ".
-                         "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=$page->id\">".
-                        get_string("addabranchtable", "lesson")."</a><br />";
-                    // the current page or the next page is an end of branch don't show EOB link
-                    $nextqtype = 0; // set to anything else EOB
-                    if ($page->nextpageid) {
-                        $nextqtype = get_field("lesson_pages", "qtype", "id", $page->nextpageid);
-                    }
-                    if (($page->qtype != LESSON_ENDOFBRANCH) and ($nextqtype != LESSON_ENDOFBRANCH)) {
-                        echo "<a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=addendofbranch&amp;pageid=$page->id\">".
-                        get_string("addanendofbranch", "lesson")."</a> | ";
-                    }
-                    echo "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=$page->id\">".
-                        get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
-                        "</a></small></td></tr>\n";
-                }
-//                echo "<tr><td>\n";
-                // check the prev links - fix (silently) if necessary - there was a bug in
-                // versions 1 and 2 when add new pages. Not serious then as the backwards
-                // links were not used in those versions
-                if (isset($prevpageid)) {
-                    if ($page->prevpageid != $prevpageid) {
-                        // fix it
-                        set_field("lesson_pages", "prevpageid", $prevpageid, "id", $page->id);
-                        if ($CFG->debug) {
-                            echo "<p>***prevpageid of page $page->id set to $prevpageid***";
-                        }
-                    }
-                }
-                $prevpageid = $page->id;
-                // move to next page
-                if($singlePage) {  // this will make sure only one page is displayed if needed
-                    break;
-                } elseif($branch && $page->qtype == LESSON_ENDOFBRANCH) {  // this will display a branch table and its contents
-                    break;
-                } elseif ($page->nextpageid) {
-                    if (!$page = get_record("lesson_pages", "id", $page->nextpageid)) {
-                        error("Teacher view: Next page not found!");
-                    }
-                } else {
-                    // last page reached
-                    break;
-                }
-            }
-        } // end of else from above collapsed code!!!
-        
-            echo "</table></form>\n";
-        } 
-    }
-        
     /*************** no man's land **************************************/
     else {
         error("Fatal Error: Unknown Action: ".$action."\n");