Index: addpage.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/addpage.php,v
retrieving revision 1.13
diff -u -r1.13 addpage.php
--- addpage.php	19 Sep 2006 04:49:45 -0000	1.13
+++ addpage.php	16 Oct 2006 12:38:30 -0000
@@ -1,18 +1,18 @@
-<?php // $Id: addpage.php,v 1.13 2006/09/19 04:49:45 mark-nielsen Exp $
-/**
- *  Action for adding a question page.  Prints an HTML form.
- *
- * @version $Id: addpage.php,v 1.13 2006/09/19 04:49:45 mark-nielsen Exp $
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package lesson
- **/
-    $CFG->pagepath = 'mod/lesson/addpage';
+<?php  
+class addnewpage extends moodleform {
     
+   function definition() {
+    global $USER,$CFG;
+    $CFG->pagepath = 'mod/lesson/addpage';
+    $mform =& $this->_form;
+    $renderer =& $mform->defaultRenderer();
     // first get the preceeding page
-    $pageid = required_param('pageid', PARAM_INT);
-    $qtype = optional_param('qtype', LESSON_MULTICHOICE, PARAM_INT);
-    
-    // set of jump array
+    $cm   = $this->_customdata['cm'];
+    $lesson = $this->_customdata['lesson'];
+    $pageid   = $this->_customdata['pageid'];
+    $qtype = $this->_customdata['qtype'];
+    $LESSON_QUESTION_TYPE= $this->_customdata['LESSON_QUESTION_TYPE']; 
+    // set of jump array     
     $jump = array();
     $jump[0] = get_string("thispage", "lesson");
     $jump[LESSON_NEXTPAGE] = get_string("nextpage", "lesson");
@@ -41,118 +41,87 @@
         }
     } else {
         $linkadd = "&firstpage=1";
-    }
-
-    // give teacher a blank proforma
+    }    
     print_heading_with_help(get_string("addaquestionpage", "lesson"), "overview", "lesson");
-    ?>
-    <form name="form" method="post" action="lesson.php">
-    <input type="hidden" name="id" value="<?php echo $cm->id ?>">
-    <input type="hidden" name="action" value="insertpage">
-    <input type="hidden" name="pageid" value="<?php echo $pageid ?>">
-    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
-    <center>
-      <?php
-        echo '<b>'.get_string("questiontype", "lesson").":</b> \n";
-        echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br>";
-        lesson_qtype_menu($LESSON_QUESTION_TYPE, $qtype, 
+    $mform->addElement('hidden','id',$cm->id);
+    $mform->addElement('hidden','action','insertpage');
+    $mform->addElement('hidden','pageid',$pageid);
+    $mform->addElement('hidden','qtype',$qtype);  
+    $mform->addElement('hidden','sesskey',$USER->sesskey);
+    lesson_qtype_menu($LESSON_QUESTION_TYPE, $qtype, 
                           "lesson.php?id=$cm->id&action=addpage&pageid=".$pageid.$linkadd);
-
-        if ( $qtype == LESSON_SHORTANSWER || $qtype == LESSON_MULTICHOICE ) {  // only display this option for Multichoice and shortanswer
-            echo '<p>';
+    if ($qtype == LESSON_SHORTANSWER || $qtype == LESSON_MULTICHOICE ) {  // only display this option for Multichoice and shortanswer
+            
             if ($qtype == LESSON_SHORTANSWER) {
                 $qoptionstr = get_string('casesensitive', 'lesson');
             } else {
                 $qoptionstr = get_string('multianswer', 'lesson');
             }
-            echo "<label for=\"qoption\"><strong>$qoptionstr</strong></label><input type=\"checkbox\" id=\"qoption\" name=\"qoption\" value=\"1\"/>";
-            helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson");
-            echo '</p>';
-        }
-    ?>
-    <table cellpadding="5" class="generalbox" border="1">
-    <tr valign="top">
-    <td><b><label for="title"><?php print_string("pagetitle", "lesson"); ?>:</label></b><br />
-    <input type="text" id="title" name="title" size="80" maxsize="255" value=""></td></tr>
-    <?php
-    echo "<tr><td><b>";
-    echo get_string("pagecontents", "lesson").":</b><br />\n";
-    print_textarea($usehtmleditor, 25,70, 630, 400, "contents");
-    use_html_editor("contents");
-    echo "</td></tr>\n";
-    switch ($qtype) {
+            $mform->addElement('checkbox','qoption',$qoptionstr);           
+           
+        }       
+    $mform->addElement('text','title',get_string("pagetitle", "lesson"),'maxlength="255" size="70"');
+    $mform->addElement('htmleditor','contents',get_string("pagecontents", "lesson"),array('rows'=>'20', 'cols'=>'65'));    
+    switch ($qtype) {        
         case LESSON_TRUEFALSE :
             for ($i = 0; $i < 2; $i++) {
-                $iplus1 = $i + 1;
-                echo "<tr><td><b>".get_string("answer", "lesson")." $iplus1:</b><br />\n";
-                print_textarea(false, 6, 70, 630, 300, "answer[$i]");
-                echo "</td></tr>\n";
-                echo "<tr><td><b>".get_string("response", "lesson")." $iplus1:</b><br />\n";
-                print_textarea(false, 6, 70, 630, 300, "response[$i]");
-                echo "</td></tr>\n";
-                echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                if ($i) {
-                    // answers 2, 3, 4... jumpto this page
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                $iplus1 = $i + 1;           
+                $mform->addElement('textarea',"answer[$i]",get_string("answer", "lesson").$iplus1,array('rows'=>'6', 'cols'=>'60'));
+                $mform->addElement('textarea',"response[$i]",get_string("response", "lesson").$iplus1,array('rows'=>'6', 'cols'=>'60')); 
+                 if ($i) {
+                    // answers 2, 3, 4... jumpto this page                   
+                    $mform->addElement('select',"jumpto[$i]",get_string("jump", "lesson")."$iplus1:",$jump);
+                    $mform->setDefault("jumpto[$i]",'0');
                 } else {
-                    // answer 1 jumpto next page
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                     // answer 1 jumpto next page
+                    $mform->addElement('select',"jumpto[$i]",get_string("jump", "lesson")."$iplus1:",$jump);
+                    $mform->setDefault("jumpto[$i]",LESSON_NEXTPAGE);
                 }
-                helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                 if($lesson->custom) {
                     if ($i) {
-                        echo get_string("score", "lesson")." $iplus1: <input type=\"text\" name=\"score[$i]\" value=\"0\" size=\"5\">";
+                        $mform->addElement('text',"score[$i]",get_string("score", "lesson")." $iplus1:",'size="5"');
+                        $mform->setDefault("score[$i]",'0');
                     } else {
-                        echo get_string("score", "lesson")." $iplus1: <input type=\"text\" name=\"score[$i]\" value=\"1\" size=\"5\">";
+                        $mform->addElement('text',"score[$i]",get_string("score", "lesson")." $iplus1:",'size="5"');
+                        $mform->setDefault("score[$i]",'1');
                     }
                 }
-                echo "</td></tr>\n";
-            }
+               }
             break;
-        case LESSON_ESSAY :
-                echo "<tr><td><B>".get_string("jump", "lesson").":</b> \n";
-                choose_from_menu($jump, "jumpto[0]", LESSON_NEXTPAGE, "");
-                helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
+        case LESSON_ESSAY :             
+                $mform->addElement('select',"jumpto[0]",get_string("jump", "lesson").":",$jump);
+                $mform->setDefault("jumpto[0]",LESSON_NEXTPAGE);                
                 if ($lesson->custom) {
-                    echo get_string("score", "lesson").": <input type=\"text\" name=\"score[0]\" value=\"1\" size=\"5\">";
-                }
-                echo "</td></tr>\n";
+                    $mform->addElement('text',"score[0]",get_string("score", "lesson"),'size="5"');
+                    $mform->setDefault("score[0]",'1');
+                }               
             break;
         case LESSON_MATCHING :
             for ($i = 0; $i < $lesson->maxanswers+2; $i++) {
                 $icorrected = $i - 1;
-                if ($i == 0) {
-                    echo "<tr><td><b>".get_string("correctresponse", "lesson").":</b><br />\n";
-                    print_textarea(false, 6, 70, 630, 300, "answer[$i]");
-                    echo "</td></tr>\n";
+                if ($i == 0) {                    
+                 $mform->addElement('textarea',"answer[$i]",get_string("correctresponse", "lesson").":",array('rows'=>'6', 'cols'=>'60'));
                 } elseif ($i == 1) {
-                    echo "<tr><td><b>".get_string("wrongresponse", "lesson").":</b><br />\n";
-                    print_textarea(false, 6, 70, 630, 300, "answer[$i]");
-                    echo "</td></tr>\n";
+                 $mform->addElement('textarea',"answer[$i]",get_string("wrongresponse", "lesson").":",array('rows'=>'6', 'cols'=>'60'));
                 } else {                                                
-                    echo "<tr><td><b>".get_string("answer", "lesson")." $icorrected:</b><br />\n";
-                    print_textarea(false, 6, 70, 630, 300, "answer[$i]");
-                    echo "</td></tr>\n";
-                    echo "<tr><td><b>".get_string("matchesanswer", "lesson")." $icorrected:</b><br />\n";
-                    print_textarea(false, 6, 70, 630, 300, "response[$i]");
-                    echo "</td></tr>\n";
+                    $mform->addElement('textarea',"answer[$i]",get_string("answer", "lesson")."$icorrected:",array('rows'=>'6', 'cols'=>'60'));
+                    $mform->addElement('textarea',"response[$i]",get_string("matchesanswer", "lesson")."$icorrected:",array('rows'=>'6', 'cols'=>'60'));
+                    
                 }
                 if ($i == 2) {
-                    echo "<tr><td><B>".get_string("correctanswerjump", "lesson").":</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
-                    helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
+                    $mform->addElement('select',"jumpto[$i]",get_string("correctanswerjump", "lesson").":",$jump);
+                    $mform->setDefault("jumpto[$i]",LESSON_NEXTPAGE); 
                     if($lesson->custom) {
-                        echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"1\" size=\"5\">";
-                    }
-                    echo "</td></tr>\n";
+                        $mform->addElement('text',"score[$i]",get_string("correctanswerscore", "lesson"),'size="5"');
+                        $mform->setDefault("score[$i]",'1');
+                    }                   
                 } elseif ($i == 3) {
-                    echo "<tr><td><B>".get_string("wronganswerjump", "lesson").":</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
-                    helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
+                    $mform->addElement('select',"jumpto[$i]",get_string("wronganswerjump", "lesson").":",$jump);
+                    $mform->setDefault("jumpto[$i]",'0');
                     if($lesson->custom) {
-                        echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"0\" size=\"5\">";
-                    }
-                    echo "</td></tr>\n";
+                        $mform->addElement('text',"score[$i]",get_string("wronganswerscore", "lesson").":",'size="5"');
+                        $mform->setDefault("score[$i]",'0');
+                       }                   
                 }
             }
             break;
@@ -161,37 +130,37 @@
         case LESSON_MULTICHOICE :
             // default code
             for ($i = 0; $i < $lesson->maxanswers; $i++) {
-                $iplus1 = $i + 1;
-                echo "<tr><td><b>".get_string("answer", "lesson")." $iplus1:</b><br />\n";
-                print_textarea(false, 6, 70, 630, 300, "answer[$i]");
-                echo "</td></tr>\n";
-                echo "<tr><td><b>".get_string("response", "lesson")." $iplus1:</b><br />\n";
-                print_textarea(false, 6, 70, 630, 300, "response[$i]");
-                echo "</td></tr>\n";
-                echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                if ($i) {
-                    // answers 2, 3, 4... jumpto this page
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                $iplus1 = $i + 1;                           
+                $mform->addElement('textarea',"answer[$i]",get_string("answer", "lesson")."$iplus1:",array('rows'=>'6', 'cols'=>'60'));
+                $mform->addElement('textarea',"response[$i]",get_string("response", "lesson")."$iplus1:",array('rows'=>'6', 'cols'=>'60'));
+              if ($i) {
+                    // answers 2, 3, 4... jumpto this page                   
+                    $mform->addElement('select',"jumpto[$i]",get_string("jump", "lesson")."$iplus1:",$jump);
+                    $mform->setDefault("jumpto[$i]",'0');
                 } else {
-                    // answer 1 jumpto next page
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
-                }
-                helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
-                if($lesson->custom) {
+                    // answer 1 jumpto next page                  
+                    $mform->addElement('select',"jumpto[$i]",get_string("jump", "lesson")."$iplus1:",$jump);
+                    $mform->setDefault("jumpto[$i]",LESSON_NEXTPAGE); 
+                }                
+              if($lesson->custom) {
                     if ($i) {
-                        echo get_string("score", "lesson")." $iplus1: <input type=\"text\" name=\"score[$i]\" value=\"0\" size=\"5\">";
+                        $mform->addElement('text',"score[$i]",get_string("score", "lesson")."$iplus1:",'size="5"');
+                        $mform->setDefault("score[$i]",'0');
                     } else {
-                        echo get_string("score", "lesson")." $iplus1: <input type=\"text\" name=\"score[$i]\" value=\"1\" size=\"5\">";
+                        $mform->addElement('text',"score[$i]",get_string("score", "lesson")."$iplus1:",'size="5"');
+                        $mform->setDefault("score[$i]",'1');
                     }
                 }
-                echo "</td></tr>\n";
             }
             break;
     }
-    // close table and form
-    ?>
-    </table><br />
-    <input type="submit" value="<?php  print_string("addaquestionpage", "lesson") ?>">
-    <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
-    </center>
-    </form>
+    $mform->addElement('submit','',get_string("addaquestionpage", "lesson"));
+    $mform->addElement('submit','cancel',get_string("cancel"));
+    
+    }
+}
+  $pageid = required_param('pageid', PARAM_INT);
+  $qtype  = optional_param('qtype', LESSON_MULTICHOICE, PARAM_INT);
+  $maddform =new addnewpage('lesson.php',compact('pageid','qtype','lesson','pageid','cm','LESSON_QUESTION_TYPE'));   
+  $maddform->display(); 
+?>
\ No newline at end of file