mirror of
https://github.com/moodle/moodle.git
synced 2025-08-06 01:16:44 +02:00
MDL-21652 html_table rendering refactored
* class html_component does not exist any more * class html_table rendered via html_writer::table() * html_table, html_table_row and html_table_cell have public $attributes property to set their CSS classes * dropped rotateheaders feature, should be added again after more research of possible ways (<svg> is not nice IMHO) * dropped possibility to define CSS classes for table heading, body and footer - can be easily done and better done using just table class and context
This commit is contained in:
parent
ad70376ce2
commit
16be897441
106 changed files with 565 additions and 677 deletions
|
@ -54,7 +54,7 @@ class workshopallocation_manual_renderer extends plugin_renderer_base {
|
|||
$reviewers = array_map('fullname', $reviewers);
|
||||
|
||||
$table = new html_table();
|
||||
$table->set_classes('allocations');
|
||||
$table->attributes['class'] = 'allocations';
|
||||
$table->head = array(get_string('participantreviewedby', 'workshop'),
|
||||
get_string('participant', 'workshop'),
|
||||
get_string('participantrevierof', 'workshop'));
|
||||
|
@ -77,7 +77,7 @@ class workshopallocation_manual_renderer extends plugin_renderer_base {
|
|||
$table->data[] = $row;
|
||||
}
|
||||
|
||||
return $this->output->container($this->output->table($table), 'manual-allocator');
|
||||
return $this->output->container(html_writer::table($table), 'manual-allocator');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -362,11 +362,11 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
throw new coding_exception('you must provide the prepared user plan to be rendered');
|
||||
}
|
||||
$table = new html_table();
|
||||
$table->set_classes('userplan');
|
||||
$table->attributes['class'] = 'userplan';
|
||||
$table->head = array();
|
||||
$table->colclasses = array();
|
||||
$row = new html_table_row();
|
||||
$row->set_classes('phasetasks');
|
||||
$row->attributes['class'] = 'phasetasks';
|
||||
foreach ($plan as $phasecode => $phase) {
|
||||
$title = html_writer::tag('span', $phase->title);
|
||||
$actions = '';
|
||||
|
@ -394,7 +394,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
}
|
||||
$table->data = array($row);
|
||||
|
||||
return $this->output->table($table);
|
||||
return html_writer::table($table);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -450,7 +450,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
}
|
||||
|
||||
$table = new html_table();
|
||||
$table->set_classes('grading-report');
|
||||
$table->attributes['class'] = 'grading-report';
|
||||
|
||||
$sortbyfirstname = $this->sortable_heading(get_string('firstname'), 'firstname', $options->sortby, $options->sorthow);
|
||||
$sortbylastname = $this->sortable_heading(get_string('lastname'), 'lastname', $options->sortby, $options->sorthow);
|
||||
|
@ -509,7 +509,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell = new html_table_cell();
|
||||
$cell->text = $this->grading_report_participant($participant, $userinfo);
|
||||
$cell->rowspan = $numoftrs;
|
||||
$cell->add_class('participant');
|
||||
$cell->attributes['class'] = 'participant';
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
// column #2 - submission - spans over all rows
|
||||
|
@ -517,7 +517,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell = new html_table_cell();
|
||||
$cell->text = $this->grading_report_submission($participant);
|
||||
$cell->rowspan = $numoftrs;
|
||||
$cell->add_class('submission');
|
||||
$cell->attributes['class'] = 'submission';
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
// column #3 - received grades
|
||||
|
@ -528,11 +528,11 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell->text = $this->grading_report_assessment($assessment, $options->showreviewernames, $userinfo,
|
||||
get_string('gradereceivedfrom', 'workshop'));
|
||||
$cell->rowspan = $spanreceived;
|
||||
$cell->add_class('receivedgrade');
|
||||
$cell->attributes['class'] = 'receivedgrade';
|
||||
if (is_null($assessment) or is_null($assessment->grade)) {
|
||||
$cell->add_class('null');
|
||||
$cell->attributes['class'] .= ' null';
|
||||
} else {
|
||||
$cell->add_class('notnull');
|
||||
$cell->attributes['class'] .= ' notnull';
|
||||
}
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
|
@ -541,7 +541,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell = new html_table_cell();
|
||||
$cell->text = $this->grading_report_grade($participant->submissiongrade, $participant->submissiongradeover);
|
||||
$cell->rowspan = $numoftrs;
|
||||
$cell->add_class('submissiongrade');
|
||||
$cell->attributes['class'] = 'submissiongrade';
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
// column #5 - given grades
|
||||
|
@ -552,11 +552,11 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell->text = $this->grading_report_assessment($assessment, $options->showauthornames, $userinfo,
|
||||
get_string('gradegivento', 'workshop'));
|
||||
$cell->rowspan = $spangiven;
|
||||
$cell->add_class('givengrade');
|
||||
$cell->attributes['class'] = 'givengrade';
|
||||
if (is_null($assessment) or is_null($assessment->grade)) {
|
||||
$cell->add_class('null');
|
||||
$cell->attributes['class'] .= ' null';
|
||||
} else {
|
||||
$cell->add_class('notnull');
|
||||
$cell->attributes['class'] .= ' notnull';
|
||||
}
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
|
@ -565,7 +565,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
$cell = new html_table_cell();
|
||||
$cell->text = $this->grading_report_grade($participant->gradinggrade);
|
||||
$cell->rowspan = $numoftrs;
|
||||
$cell->add_class('gradinggrade');
|
||||
$cell->attributes['class'] = 'gradinggrade';
|
||||
$row->cells[] = $cell;
|
||||
}
|
||||
|
||||
|
@ -573,7 +573,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
|
|||
}
|
||||
}
|
||||
|
||||
return $this->output->table($table);
|
||||
return html_writer::table($table);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue