MDL-74808 question: remove span element from label

This commit is contained in:
Simey Lameze
2022-07-08 14:38:04 +08:00
parent f62ae260f4
commit 8dc41648e3
@@ -33,19 +33,17 @@ class question_name_idnumber_tags_column extends viewquestionname_column_helper
protected function display_content($question, $rowclasses): void {
global $OUTPUT;
$layoutclasses = 'd-inline-flex flex-nowrap overflow-hidden w-100';
echo \html_writer::start_tag('div', ['class' => 'd-inline-flex flex-nowrap overflow-hidden w-100']);
$questionname = format_string($question->name);
$labelfor = $this->label_for($question);
if ($labelfor) {
echo \html_writer::start_tag('label', ['for' => $labelfor, 'class' => $layoutclasses]);
$closetag = \html_writer::end_tag('label');
echo \html_writer::label($questionname, $labelfor);
} else {
echo \html_writer::start_tag('span', ['class' => $layoutclasses]);
echo \html_writer::end_tag('span');
// Question name.
echo \html_writer::span($questionname, 'questionname flex-grow-1 flex-shrink-1 text-truncate');
}
// Question name.
echo \html_writer::span(format_string($question->name), 'questionname flex-grow-1 flex-shrink-1 text-truncate');
// Question idnumber.
if ($question->idnumber !== null && $question->idnumber !== '') {
echo ' ' . \html_writer::span(
@@ -59,7 +57,7 @@ class question_name_idnumber_tags_column extends viewquestionname_column_helper
echo $OUTPUT->tag_list($tags, null, 'd-inline flex-shrink-1 text-truncate ml-1', 0, null, true);
}
echo $closetag; // Computed above to ensure it matches.
echo \html_writer::end_tag('div');
}
public function get_required_fields(): array {