MDL-4793 - Option to show question text in the question bank.\r\rAlso, fix layout probl...

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 1f5e1eb8e8f6124ef21c9f5ca0136faaf877b72a..59b102b7532c1aae40e822c468a14f09c65a71a3 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -480,6 +480,7 @@ $string['showfeedback'] = 'After answering, show feedback?';
 $string['showhidden'] = 'Also show old questions';
 $string['shownoattempts'] = 'Show students with no attempts';
 $string['shownoattemptsonly'] = 'Show only students with no attempts';
+$string['showquestiontext'] = 'Show show question text in the question list';
 $string['showteacherattempts'] = 'Show teacher attempts';
 $string['shuffle'] = 'Shuffle';
 $string['shuffleanswers'] = 'Shuffle answers';

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 4db09e5b11e19efa55ade840c6b59f45764dbf92..f301f6b6392cfce8ff0a73c617ddad29415848f0 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -176,17 +176,17 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
         $lastindex++;
     }
     echo "<form method=\"post\" action=\"edit.php\">";
-    echo '<fieldset class="invisiblefieldset">';
+    echo '<fieldset class="invisiblefieldset" style="display: block;">';
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
 
     print_simple_box_start();
-    echo "<table border=\"0\" cellpadding=\"2\" cellspacing=\"0\" style=\"width:100%;\">\n";
+    echo "<table style=\"width:100%;\">\n";
     echo "<tr><th colspan=\"3\" style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strorder</th>";
     echo "<th class=\"header\" scope=\"col\">#</th>";
-    echo "<th align=\"left\" style=\"white-space:nowrap; width:100%\" class=\"header\" scope=\"col\">$strquestionname</th>";
+    echo "<th align=\"left\" style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strquestionname</th>";
     echo "<th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strtype</th>";
     echo "<th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strgrade</th>";
-    echo "<th align=\"center\" style=\"white-space:nowrap; width:60px;\" class=\"header\" scope=\"col\">$straction</th>";
+    echo "<th align=\"center\" style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$straction</th>";
     echo "</tr>\n";
     foreach ($order as $i => $qnum) {
 

diff --git a/question/editlib.php b/question/editlib.php
index 00848ed6c2e574f67775314ace0c42f91f9f5c01..dd2d8417de6ff95a34dc3b0f599acd193446f9d6 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -130,7 +130,7 @@ function question_category_menu($courseid, $published=false) {
 /**
  * prints a form to choose categories
  */
-function question_category_form($course, $current, $recurse=1, $showhidden=false) {
+function question_category_form($course, $current, $recurse=1, $showhidden=false, $showquestiontext=false) {
     global $CFG;
 
 /// Make sure the default category exists for this course
@@ -159,7 +159,7 @@ function question_category_form($course, $current, $recurse=1, $showhidden=false
     $strshow = get_string("show", "quiz");
     $streditcats = get_string("editcategories", "quiz");
 
-    echo "<table style=\"width:100%;\"><tr><td style=\"width:20px; white-space:nowrap;\">";
+    echo "<table><tr><td style=\"white-space:nowrap;\">";
     echo "<strong>$strcategory:</strong>&nbsp;";
     echo "</td><td>";
     popup_form ("edit.php?courseid=$course->id&amp;cat=", $catmenu, "catmenu", $current, "", "", "", false, "self");
@@ -174,30 +174,29 @@ function question_category_form($course, $current, $recurse=1, $showhidden=false
 
     echo '<form method="post" action="edit.php" id="displayoptions">';
     echo "<fieldset class='invisiblefieldset'>";
-    echo '<table><tr><td>';
-    echo "<input type=\"hidden\" name=\"courseid\" value=\"{$course->id}\" />";
-    echo '<input type="hidden" name="recurse" value="0" />';
-    echo '<input type="checkbox" name="recurse" value="1"';
-    if ($recurse) {
-        echo ' checked="checked"';
-    }
-    echo ' onchange="getElementById(\'displayoptions\').submit(); return true;" />';
-    print_string('recurse', 'quiz');
-    // hide-feature
-    echo '<br />';
-    echo '<input type="hidden" name="showhidden" value="0" />';
-    echo '<input type="checkbox" name="showhidden"';
-    if ($showhidden) {
+    echo "<input type=\"hidden\" name=\"courseid\" value=\"{$course->id}\" />\n";
+    question_category_form_checkbox('recurse', $recurse);
+    question_category_form_checkbox('showhidden', $showhidden);
+    question_category_form_checkbox('showquestiontext', $showquestiontext);
+    echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go') .'" />';
+    echo '</div></noscript></fieldset></form>';
+}
+
+/**
+ * Private funciton to help the preceeding function.
+ */
+function question_category_form_checkbox($name, $checked) {
+    echo '<div><input type="hidden" id="' . $name . '_off" name="' . $name . '" value="0" />';
+    echo '<input type="checkbox" id="' . $name . '_on" name="' . $name . '" value="1"';
+    if ($checked) {
         echo ' checked="checked"';
     }
     echo ' onchange="getElementById(\'displayoptions\').submit(); return true;" />';
-    print_string('showhidden', 'quiz');
-    echo '</td><td valign="middle"><noscript><div>';
-    echo ' <input type="submit" value="'. get_string('go') .'" />';
-    echo '</div></noscript></td></tr></table></fieldset></form>';
+    echo '<label for="' . $name . '_on">';
+    print_string($name, 'quiz');
+    echo "</label></div>\n";
 }
 
-
 /**
 * Prints the table of questions in a category with interactions
 *
@@ -210,7 +209,8 @@ function question_category_form($course, $current, $recurse=1, $showhidden=false
 * @param boolean $showhidden   True if also hidden questions should be displayed
 */
 function question_list($course, $categoryid, $quizid=0,
- $recurse=1, $page=0, $perpage=100, $showhidden=false, $sortorder='qtype, name ASC') {
+        $recurse=1, $page=0, $perpage=100, $showhidden=false, $sortorder='qtype, name ASC',
+        $showquestiontext = false) {
     global $QTYPE_MENU, $USER, $CFG, $THEME;
     
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
@@ -272,7 +272,7 @@ function question_list($course, $categoryid, $quizid=0,
         echo '<td valign="top" align="right">';
         popup_form ("$CFG->wwwroot/question/question.php?category=$category->id&amp;qtype=", $qtypemenu, "addquestion",
                     "", "choose", "", "", false, "self");
-        echo '</td><td style="width:10px;" valign="top" align="right">';
+        echo '</td><td valign="top" align="right">';
         helpbutton("questiontypes", $strcreatenewquestion, "quiz");
         echo '</td></tr>';
     }
@@ -282,22 +282,7 @@ function question_list($course, $categoryid, $quizid=0,
         echo '</td></tr>';
     }
 
-    echo '<tr><td colspan="3" align="right" style="font-size:0.8em;">';
-    
-    if (has_capability('moodle/question:import', $context)) {
-        echo '<a href="'.$CFG->wwwroot.'/question/import.php?category='.$category->id.'">'.$strimportquestions.'</a>';
-        helpbutton("import", $strimportquestions, "quiz");
-        echo ' | ';
-    }
-    
-    if (has_capability('moodle/question:export', $context)) {
-        echo "<a href=\"$CFG->wwwroot/question/export.php?category={$category->id}&amp;courseid={$course->id}\">$strexportquestions</a>";
-        helpbutton("export", $strexportquestions, "quiz");
-    }  
-    echo '</td></tr>';
-
     echo '</table>';
-
     echo '</div>';
 
     $categorylist = ($recurse) ? question_categorylist($category->id) : $category->id;
@@ -330,23 +315,38 @@ function question_list($course, $categoryid, $quizid=0,
     $canedit = has_capability('moodle/question:manage', $context);
 
     echo '<form method="post" action="edit.php?courseid='.$course->id.'">';
-    echo '<fieldset class="invisiblefieldset">';
+    echo '<fieldset class="invisiblefieldset" style="display: block;">';
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     print_simple_box_start();
-    echo '<table id="categoryquestions" cellspacing="0"><tr>';
-    $actionwidth = $canedit ? 95 : 70;
-    echo "<th style=\"width:$actionwidth; white-space:nowrap;\" class=\"header\" scope=\"col\">$straction</th>";
+    echo '<table id="categoryquestions" style="width: 100%"><tr>';
+    echo "<th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$straction</th>";
     
     $sortoptions = array('name, qtype ASC' => get_string("sortalpha", "quiz"),
                          'qtype, name ASC' => get_string("sorttypealpha", "quiz"),
                          'id ASC' => get_string("sortage", "quiz"));
     $orderselect  = choose_from_menu ($sortoptions, 'sortorder', $sortorder, false, 'this.form.submit();', '0', true);
     $orderselect .= '<noscript><div><input type="submit" value="'.get_string("sortsubmit", "quiz").'" /></div></noscript>';
-    echo "<th align=\"left\" style=\"width:100%; white-space:nowrap;\" class=\"header\" scope=\"col\">$strquestionname $orderselect</th>
-    <th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strtype</th>";
+    echo "<th style=\"white-space:nowrap; text-align: left;\" class=\"header\" scope=\"col\">$strquestionname $orderselect</th>
+    <th style=\"white-space:nowrap; text-align: right;\" class=\"header\" scope=\"col\">$strtype</th>";
     echo "</tr>\n";
     foreach ($questions as $question) {
-        echo "<tr>\n<td style=\"white-space:nowrap;\">\n";
+        $nameclass = '';
+        $textclass = '';
+        if ($question->hidden) {
+            $nameclass = 'dimmed_text';
+            $textclass = 'dimmed_text';
+        }
+        if ($showquestiontext) {
+            $nameclass .= ' header';
+        }
+        if ($nameclass) {
+            $nameclass = 'class="' . $nameclass . '"';
+        }
+        if ($textclass) {
+            $textclass = 'class="' . $textclass . '"';
+        }
+        
+        echo "<tr>\n<td style=\"white-space:nowrap;\" $nameclass>\n";
         
         // add to quiz
         if ($quizid && has_capability('mod/quiz:manage', $context)) {
@@ -375,27 +375,41 @@ function question_list($course, $categoryid, $quizid=0,
         echo "&nbsp;<input title=\"$strselect\" type=\"checkbox\" name=\"q$question->id\" value=\"1\" />";
         echo "</td>\n";
 
-        if ($question->hidden) {
-            echo '<td class="dimmed_text">'.$question->name."</td>\n";
-        } else {
-            echo "<td>".$question->name."</td>\n";
-        }
-        echo "<td align=\"center\">\n";
+        echo "<td $nameclass>" . $question->name . "</td>\n";
+        echo "<td $nameclass style='text-align: right'>\n";
         print_question_icon($question, $canedit);
         echo "</td>\n";
         echo "</tr>\n";
+        if($showquestiontext){
+            echo '<tr><td colspan="3" ' . $textclass . '>';
+            $formatoptions = new stdClass;
+            $formatoptions->noclean = true;
+            $formatoptions->para = false;
+            echo format_text($question->questiontext, $question->questiontextformat,
+                    $formatoptions, $course->id);
+            echo "</td></tr>\n";
+        }
     }
-    echo '<tr><td align="center" colspan="3">';
-    print_paging_bar($totalnumber, $page, $perpage, "edit.php?courseid={$course->id}&amp;perpage=$perpage&amp;");
+    echo "</table>\n";
+    print_simple_box_end();
+
+    $paging = print_paging_bar($totalnumber, $page, $perpage,
+            "edit.php?courseid={$course->id}&amp;perpage=$perpage&amp;", 'page',
+            false, true);
     if ($totalnumber > DEFAULT_QUESTIONS_PER_PAGE) {
         if ($perpage == DEFAULT_QUESTIONS_PER_PAGE) {
-            echo '<a href="edit.php?courseid='.$course->id.'&amp;perpage=1000">'.get_string('showall', 'moodle', $totalnumber).'</a>';
+            $showall = '<a href="edit.php?courseid='.$course->id.'&amp;perpage=1000">'.get_string('showall', 'moodle', $totalnumber).'</a>';
         } else {
-            echo '<a href="edit.php?courseid='.$course->id.'&amp;perpage=' . DEFAULT_QUESTIONS_PER_PAGE . '">'.get_string('showperpage', 'moodle', DEFAULT_QUESTIONS_PER_PAGE).'</a>';
+            $showall = '<a href="edit.php?courseid='.$course->id.'&amp;perpage=' . DEFAULT_QUESTIONS_PER_PAGE . '">'.get_string('showperpage', 'moodle', DEFAULT_QUESTIONS_PER_PAGE).'</a>';
+        }
+        if ($paging) {
+            $paging = substr($paging, 0, strrpos($paging, '</div>'));
+            $paging .= "<br />$showall</div>";
+        } else {
+            $paging = "<div class='paging'>$showall</div>"; 
         }
     }
-    echo "</td></tr></table>\n";
-    print_simple_box_end();
+    echo $paging;
 
     echo '<table class="quiz-edit-selected"><tr><td colspan="2">';
     echo '<a href="javascript:select_all_in(\'TABLE\', null, \'categoryquestions\');">'.$strselectall.'</a> /'.

diff --git a/question/showbank.php b/question/showbank.php
index 14a19c777b8a2085acc155862131c8ce5b269c5f..57abaeea2dff7ec01130a87f193a80289b5e165c 100644 (file)
--- a/question/showbank.php
+++ b/question/showbank.php
@@ -147,39 +147,45 @@
         $SESSION->questionpage = 0;
     }
 
-    if(isset($_REQUEST['recurse'])) {
-        $SESSION->questionrecurse = optional_param('recurse', 0, PARAM_BOOL);
-    }
-
-    if(isset($_REQUEST['showhidden'])) {
-        $SESSION->questionshowhidden = optional_param('showhidden', 0, PARAM_BOOL);
+    if (empty($SESSION->questioncat) or !count_records_select("question_categories", "id = '{$SESSION->questioncat}' AND (course = '{$course->id}' OR publish = '1')")) {
+            $category = get_default_question_category($course->id);
+        $SESSION->questioncat = $category->id;
     }
 
-/// all commands have been dealt with, now print the page
-
-if (empty($SESSION->questioncat) or !count_records_select("question_categories", "id = '{$SESSION->questioncat}' AND (course = '{$course->id}' OR publish = '1')")) {
-        $category = get_default_question_category($course->id);
-        $SESSION->questioncat = $category->id;
+    if(($recurse = optional_param('recurse', -1, PARAM_BOOL)) != -1) {
+        $SESSION->questionrecurse = $recurse;
     }
     if (!isset($SESSION->questionrecurse)) {
         $SESSION->questionrecurse = 1;
     }
+
+    if(($showhidden = optional_param('showhidden', -1, PARAM_BOOL)) != -1) {
+        $SESSION->questionshowhidden = $showhidden;
+    }
     if (!isset($SESSION->questionshowhidden)) {
-        $SESSION->questionshowhidden = false;
+        $SESSION->questionshowhidden = 0;
+    }
+
+    if(($showquestiontext = optional_param('showquestiontext', -1, PARAM_BOOL)) != -1) {
+        $SESSION->questionshowquestiontext = $showquestiontext;
+    }
+    if (!isset($SESSION->questionshowquestiontext)) {
+        $SESSION->questionshowquestiontext = 0;
     }
 
     // starts with category selection form
     if (has_capability('moodle/question:managecategory', $context)) {
         print_simple_box_start();
-        question_category_form($course, $SESSION->questioncat, $SESSION->questionrecurse, $SESSION->questionshowhidden);
+        question_category_form($course, $SESSION->questioncat, $SESSION->questionrecurse,
+                $SESSION->questionshowhidden, $SESSION->questionshowquestiontext);
         print_simple_box_end();
-        
-        print_spacer(5,1);
     }
     
     // continues with list of questions
     print_simple_box_start();
-    question_list($course, $SESSION->questioncat, isset($modform->instance) ? $modform->instance : 0, $SESSION->questionrecurse, $page, $perpage, $SESSION->questionshowhidden, $sortorder);
+    question_list($course, $SESSION->questioncat, isset($modform->instance) ? $modform->instance : 0,
+            $SESSION->questionrecurse, $page, $perpage, $SESSION->questionshowhidden, $sortorder,
+            $SESSION->questionshowquestiontext);
     print_simple_box_end();
 
 ?>