Skip to content

Commit

Permalink
MDL-58179 mod_lesson: Add missing : in labels
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewnicols
andrewnicols committed Mar 22, 2018
1 parent 9a2bf09 commit 195480e
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion mod/lesson/locallib.php
View file
Expand Up @@ -4711,7 +4711,7 @@ public function display_answers(html_table $table) {
$i = 1;
foreach ($answers as $answer) {
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
Expand Down
4 changes: 2 additions & 2 deletions mod/lesson/pagetypes/branchtable.php
View file
Expand Up @@ -234,12 +234,12 @@ public function display_answers(html_table $table) {
continue;
}
$cells = array();
$cells[] = '<label>' . get_string('branch', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('branch', 'lesson') . ' ' . $i . '</label>: ';
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);

Expand Down
18 changes: 9 additions & 9 deletions mod/lesson/pagetypes/matching.php
View file
Expand Up @@ -268,22 +268,22 @@ public function display_answers(html_table $table) {

if ($n == 0) {
$cells = array();
$cells[] = '<label>' . get_string('correctanswerscore', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('correctanswerscore', 'lesson') . '</label>: ';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('correctanswerjump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('correctanswerjump', 'lesson') . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
} elseif ($n == 1) {
$cells = array();
$cells[] = '<label>' . get_string('wronganswerscore', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('wronganswerscore', 'lesson') . '</label>: ';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('wronganswerjump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('wronganswerjump', 'lesson') . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
}
Expand All @@ -297,19 +297,19 @@ public function display_answers(html_table $table) {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('matchesanswer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('matchesanswer', 'lesson') . " {$i}</label>: \n";
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
}
Expand Down
14 changes: 7 additions & 7 deletions mod/lesson/pagetypes/multichoice.php
View file
Expand Up @@ -277,30 +277,30 @@ public function display_answers(html_table $table) {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . " {$i}</span>: \n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . " {$i} </label>:\n";
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
Expand Down
12 changes: 6 additions & 6 deletions mod/lesson/pagetypes/numerical.php
View file
Expand Up @@ -139,30 +139,30 @@ public function display_answers(html_table $table) {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . ':</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . ':</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
Expand Down
12 changes: 6 additions & 6 deletions mod/lesson/pagetypes/shortanswer.php
View file
Expand Up @@ -199,30 +199,30 @@ public function display_answers(html_table $table) {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
Expand Down
14 changes: 7 additions & 7 deletions mod/lesson/pagetypes/truefalse.php
View file
Expand Up @@ -124,30 +124,30 @@ public function display_answers(html_table $table) {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . " {$i}</span>: \n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);

$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);

Expand Down

0 comments on commit 195480e

Please sign in to comment.