Permalink
Browse files

Changed the Make comment or override grade link display the comment f…

…ield and grade field in review.php instead of popup
  • Loading branch information...
1 parent 2a2aba2 commit 6e49714287d61c1c6a6978393acda90e6aeac74e mark-nielsen committed Apr 8, 2006
Showing with 33 additions and 4 deletions.
  1. +31 −2 question/type/question.html
  2. +2 −2 question/type/questiontype.php
@@ -3,6 +3,21 @@
* print_question() method.
*/
?>
+
+<script language="javascript" type="text/javascript">
+ if (typeof showhidecomment == "undefined") {
+ function showhidecomment (id) {
+ divobj = document.getElementById(id);
+ if (divobj.style.display == 'none') {
+ divobj.style.display = 'block';
+ } else {
+ divobj.style.display = 'none';
+ }
+ }
+ }
+</script>
+
+<a name="<?php echo $question->id; ?>">
<div id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?> clearfix">
<div class="info">
<span class="no"><?php echo $number; ?></span>
@@ -28,8 +43,18 @@
echo $comment;
?>
</div>
- <?php }
- echo $commentlink;
+ <?php } ?>
+ <div class="commentlink">
+ <?php
+ if (!empty($commentlink)) {
+ echo $commentlink;
+ ?>
+ <div id="comment-wrapper-<?php echo $question->id; ?>">
+ <?php question_print_comment_box($question, $state, $attempt, $CFG->wwwroot.'/mod/quiz/review.php?attempt='.$attempt->id.'#'.$question->id) ?>
+ </div>
+ <?php } ?>
+ </div>
+ <?php
if ($history) { ?>
<div class="history">
<?php
@@ -39,3 +64,7 @@
</div>
<?php } ?>
</div>
+
+<script language="javascript" type="text/javascript">
+ showhidecomment('comment-wrapper-<?php echo $question->id; ?>');
+</script>
@@ -478,8 +478,8 @@ function print_question(&$question, &$state, $number, $cmoptions, $options) {
$commentlink = '';
if (isset($options->questioncommentlink)) {
$strcomment = get_string('commentorgrade', 'quiz');
- $commentlink = '<div class="commentlink">'.link_to_popup_window ($options->questioncommentlink.'?attempt='.$state->attempt.'&amp;question='.$question->id,
- 'commentquestion', $strcomment, 450, 650, $strcomment, 'none', true).'</div>';
+ $attempt = get_record('quiz_attempts', 'uniqueid', $state->attempt); // would just have $attempt->uniqueid = $state->attempt but review.php needs $attempt->id
+ $commentlink = "<a href=\"javascript: showhidecomment('comment-wrapper-$question->id');\">$strcomment</a>";
}
$history = $this->history($question, $state, $number, $cmoptions, $options);

0 comments on commit 6e49714

Please sign in to comment.