L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-29141_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-08-29 13:02:27 +02:00
parent 081d16475b 1179c92d0b
commit b7424c7693
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/edit.php
+1 -1
View File
@@ -428,7 +428,7 @@ $questionbank->display('editq',
$pagevars['qpage'],
$pagevars['qperpage'],
$pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
$pagevars['showquestiontext']);
$pagevars['qbshowtext']);
echo '</div>';
echo '</div>';
echo '</div>';
mod/quiz/editlib.php
+9 -5
View File
@@ -1120,13 +1120,17 @@ class quiz_question_bank_view extends question_bank_view {
echo '</span></div></div>';
}
protected function display_options($recurse = 1, $showhidden = false, $showquestiontext = false) {
protected function display_options($recurse, $showhidden, $showquestiontext) {
echo '<form method="get" action="edit.php" id="displayoptions">';
echo "<fieldset class='invisiblefieldset'>";
echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'showquestiontext'));
$this->display_category_form_checkbox('recurse', get_string('recurse', 'quiz'));
$this->display_category_form_checkbox('showhidden', get_string('showhidden', 'quiz'));
echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go') . '" />';
echo html_writer::input_hidden_params($this->baseurl,
array('recurse', 'showhidden', 'qbshowtext'));
$this->display_category_form_checkbox('recurse', $recurse,
get_string('recurse', 'quiz'));
$this->display_category_form_checkbox('showhidden', $showhidden,
get_string('showhidden', 'quiz'));
echo '<noscript><div class="centerpara"><input type="submit" value="' .
get_string('go') . '" />';
echo '</div></noscript></fieldset></form>';
}
}
question/edit.php
+1 -1
View File
@@ -73,7 +73,7 @@
echo '<div class="questionbankwindow boxwidthwide boxaligncenter">';
$questionbank->display('questions', $pagevars['qpage'], $pagevars['qperpage'],
$pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
$pagevars['showquestiontext']);
$pagevars['qbshowtext']);
echo "</div>\n";
echo $OUTPUT->footer();
question/editlib.php
+11 -11
View File
@@ -1181,13 +1181,13 @@ class question_bank_view {
echo "</div>\n";
}
protected function display_options($recurse = 1, $showhidden = false, $showquestiontext = false) {
protected function display_options($recurse, $showhidden, $showquestiontext) {
echo '<form method="get" action="edit.php" id="displayoptions">';
echo "<fieldset class='invisiblefieldset'>";
echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'showquestiontext'));
$this->display_category_form_checkbox('recurse', get_string('recurse', 'quiz'));
$this->display_category_form_checkbox('showhidden', get_string('showhidden', 'quiz'));
$this->display_category_form_checkbox('qbshowtext', get_string('showquestiontext', 'quiz'));
echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'qbshowtext'));
$this->display_category_form_checkbox('recurse', $recurse, get_string('recurse', 'quiz'));
$this->display_category_form_checkbox('showhidden', $showhidden, get_string('showhidden', 'quiz'));
$this->display_category_form_checkbox('qbshowtext', $showquestiontext, get_string('showquestiontext', 'quiz'));
echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go') .'" />';
echo '</div></noscript></fieldset></form>';
}
@@ -1195,10 +1195,10 @@ class question_bank_view {
/**
* Print a single option checkbox. Used by the preceeding.
*/
protected function display_category_form_checkbox($name, $label) {
protected function display_category_form_checkbox($name, $value, $label) {
echo '<div><input type="hidden" id="' . $name . '_off" name="' . $name . '" value="0" />';
echo '<input type="checkbox" id="' . $name . '_on" name="' . $name . '" value="1"';
if (optional_param($name, false, PARAM_BOOL)) {
if ($value) {
echo ' checked="checked"';
}
echo ' onchange="getElementById(\'displayoptions\').submit(); return true;" />';
@@ -1615,11 +1615,11 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
$pagevars['showhidden'] = 0;
}
if(($showquestiontext = optional_param('showquestiontext', -1, PARAM_BOOL)) != -1) {
$pagevars['showquestiontext'] = $showquestiontext;
$thispageurl->param('showquestiontext', $showquestiontext);
if(($showquestiontext = optional_param('qbshowtext', -1, PARAM_BOOL)) != -1) {
$pagevars['qbshowtext'] = $showquestiontext;
$thispageurl->param('qbshowtext', $showquestiontext);
} else {
$pagevars['showquestiontext'] = 0;
$pagevars['qbshowtext'] = 0;
}
//category list page